Browse Source

修改金币掉落

DESKTOP-FB72PO8\Administrator 5 months ago
parent
commit
138c5e87c4
29 changed files with 802 additions and 63 deletions
  1. 0 0
      Assets/Art/UIAssets/TextrueJson/all.txt
  2. BIN
      Assets/Art/UIAssets/icon/icon_Coin.png
  3. 147 0
      Assets/Art/UIAssets/icon/icon_Coin.png.meta
  4. BIN
      Assets/Art/UIAssets/icon/icon_Energy.png
  5. 147 0
      Assets/Art/UIAssets/icon/icon_Energy.png.meta
  6. BIN
      Assets/Art/UIAssets/icon/icon_Gem.png
  7. 147 0
      Assets/Art/UIAssets/icon/icon_Gem.png.meta
  8. 4 4
      Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset
  9. 76 3
      Assets/Res/UI/MainUIPanel.prefab
  10. 2 2
      Assets/Res/UI/ShowItemMoveToTargetPanel.prefab
  11. 50 0
      Assets/Res/UIAtlas/all.spriteatlasv2
  12. 74 8
      Assets/Scenes/testCombat.scene
  13. 19 8
      Assets/Scripts/Core/UI/UTool/MyImage.cs
  14. 4 0
      Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs
  15. 2 1
      Assets/Scripts/GameLogic/Combat/CombatEvent/CombatItemShowEventData.cs
  16. 4 0
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs
  17. 23 6
      Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs
  18. 5 2
      Assets/Scripts/GameLogic/Player/PlayerManager.cs
  19. 29 4
      Assets/Scripts/GameUI/UI/MainUIPanel.cs
  20. 47 0
      Assets/Scripts/GameUI/UI/MainUIPanelData.cs
  21. 21 24
      Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs
  22. 1 1
      UGUIPack/uguiconfig.db
  23. BIN
      美术/art_use_ui/all/icon_Coin.png
  24. BIN
      美术/art_use_ui/all/icon_Energy.png
  25. BIN
      美术/art_use_ui/all/icon_Gem.png
  26. 0 0
      美术/unity_use_ui/TextrueJson/all.txt
  27. BIN
      美术/unity_use_ui/icon/icon_Coin.png
  28. BIN
      美术/unity_use_ui/icon/icon_Energy.png
  29. BIN
      美术/unity_use_ui/icon/icon_Gem.png

File diff suppressed because it is too large
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/all.txt


BIN
Assets/Art/UIAssets/icon/icon_Coin.png


+ 147 - 0
Assets/Art/UIAssets/icon/icon_Coin.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: Dnob5CmpUynW8lKxpT+TQSsRYF1w4PFRY5Y/Z9js4CyQB2Ak/jk+mAk=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Art/UIAssets/icon/icon_Energy.png


+ 147 - 0
Assets/Art/UIAssets/icon/icon_Energy.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: Bikb436pW3iTX/m35BY6aX5QNoeyenaXkL2lJrr22Nl/XGjsmP4VErA=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Art/UIAssets/icon/icon_Gem.png


+ 147 - 0
Assets/Art/UIAssets/icon/icon_Gem.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: XnIYtC6kUnk6XHgIkOywlKxdDZS6j+s3mjUTo4R7c95ZcFfDjvkq1mI=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 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: 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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 4
Assets/Res/AnimtionCurveLibrary/GameAnimationCurveLibrary.asset

@@ -30,21 +30,21 @@ MonoBehaviour:
     m_Curve:
     m_Curve:
     - serializedVersion: 3
     - serializedVersion: 3
       time: 0
       time: 0
-      value: 1
+      value: 0.8
       inSlope: 0
       inSlope: 0
       outSlope: 0
       outSlope: 0
       tangentMode: 34
       tangentMode: 34
       weightedMode: 0
       weightedMode: 0
       inWeight: 0
       inWeight: 0
-      outWeight: 0
+      outWeight: 0.33333334
     - serializedVersion: 3
     - serializedVersion: 3
       time: 1
       time: 1
-      value: 1
+      value: 0.8
       inSlope: 0
       inSlope: 0
       outSlope: 0
       outSlope: 0
       tangentMode: 34
       tangentMode: 34
       weightedMode: 0
       weightedMode: 0
-      inWeight: 0
+      inWeight: 0.33333334
       outWeight: 0
       outWeight: 0
     m_PreInfinity: 2
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_PostInfinity: 2

+ 76 - 3
Assets/Res/UI/MainUIPanel.prefab

@@ -1456,7 +1456,7 @@ MonoBehaviour:
   m_MinValue: 0
   m_MinValue: 0
   m_MaxValue: 1
   m_MaxValue: 1
   m_WholeNumbers: 0
   m_WholeNumbers: 0
-  m_Value: 0.248
+  m_Value: 0.442
   m_OnValueChanged:
   m_OnValueChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
@@ -2343,6 +2343,42 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4221615929694277604
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 639903755856041467}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: expPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &639903755856041467
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4221615929694277604}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7503648074123454508}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -12, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4307235955464270579
 --- !u!1 &4307235955464270579
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2626,7 +2662,7 @@ GameObject:
   - component: {fileID: 1451205693205235240}
   - component: {fileID: 1451205693205235240}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
-  m_Name: Text (TMP)
+  m_Name: coinText
   m_TagString: Untagged
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
@@ -3365,6 +3401,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 2025367596617419548}
   - {fileID: 2025367596617419548}
+  - {fileID: 639903755856041467}
   m_Father: {fileID: 5521065678043945688}
   m_Father: {fileID: 5521065678043945688}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -3695,6 +3732,42 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
     - gameObject: {fileID: 3469845461661622283}
+  - key: expPoint
+    gameObject: {fileID: 639903755856041467}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: exp
+    gameObject: {fileID: 4951065845791404470}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: TextExp
+    gameObject: {fileID: 929145644436089968}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: coinText
+    gameObject: {fileID: 1451205693205235240}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
   isAssetBundle: 1
 --- !u!1 &6780802483241756600
 --- !u!1 &6780802483241756600
 GameObject:
 GameObject:
@@ -4180,7 +4253,7 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_l_Green
   _icon_name: btn_l_Green
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: c97475968bf9f4bb39f68456035be5f8, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
   packInfo:
     packName: all
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt

+ 2 - 2
Assets/Res/UI/ShowItemMoveToTargetPanel.prefab

@@ -262,7 +262,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 35, y: 36}
+  m_SizeDelta: {x: 67, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8238198348994581963
 --- !u!222 &8238198348994581963
 CanvasRenderer:
 CanvasRenderer:
@@ -302,7 +302,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: icon_Coin
   isNotLoadDeftIcon: 1
   isNotLoadDeftIcon: 1
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
   packInfo:

+ 50 - 0
Assets/Res/UIAtlas/all.spriteatlasv2

@@ -198,5 +198,55 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
+    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
+    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
+    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
+    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
+    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
   m_IsVariant: 0
   m_IsVariant: 0
   m_IsPlaceholder: 0
   m_IsPlaceholder: 0

+ 74 - 8
Assets/Scenes/testCombat.scene

@@ -294,6 +294,38 @@ Transform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &406948033
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 406948034}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Pool
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &406948034
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 406948033}
+  serializedVersion: 2
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &718178675
 --- !u!1 &718178675
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -530,6 +562,38 @@ Transform:
   - {fileID: 852523982}
   - {fileID: 852523982}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1 &928654028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 928654029}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Pool
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &928654029
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 928654028}
+  serializedVersion: 2
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1421949364
 --- !u!1 &1421949364
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -612,29 +676,29 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   myHeroInfo:
   myHeroInfo:
   - modelName: Hero01
   - modelName: Hero01
-    hp: 100
-    att: 1
+    hp: 1000
+    att: 100
     attSpeed: 1
     attSpeed: 1
     attDis: 2
     attDis: 2
     isGpu: 0
     isGpu: 0
     skillId: 1b270000ab860100
     skillId: 1b270000ab860100
   - modelName: Hero02
   - modelName: Hero02
-    hp: 100
-    att: 1
+    hp: 1000
+    att: 100
     attSpeed: 1
     attSpeed: 1
     attDis: 4
     attDis: 4
     isGpu: 0
     isGpu: 0
     skillId: 1b2700004b0d0300
     skillId: 1b2700004b0d0300
   - modelName: Hero03
   - modelName: Hero03
-    hp: 100
-    att: 1
+    hp: 1000
+    att: 100
     attSpeed: 1
     attSpeed: 1
     attDis: 5
     attDis: 5
     isGpu: 0
     isGpu: 0
     skillId: 1b270000eb930400
     skillId: 1b270000eb930400
   - modelName: Hero04
   - modelName: Hero04
-    hp: 100
-    att: 1
+    hp: 1000
+    att: 100
     attSpeed: 1
     attSpeed: 1
     attDis: 6
     attDis: 6
     isGpu: 0
     isGpu: 0
@@ -744,3 +808,5 @@ SceneRoots:
   - {fileID: 855042511}
   - {fileID: 855042511}
   - {fileID: 718178676}
   - {fileID: 718178676}
   - {fileID: 235899921}
   - {fileID: 235899921}
+  - {fileID: 928654029}
+  - {fileID: 406948034}

+ 19 - 8
Assets/Scripts/Core/UI/UTool/MyImage.cs

@@ -97,23 +97,24 @@ namespace UnityEngine.UI
                                 _uiLoadSpriteHand = sprite1;
                                 _uiLoadSpriteHand = sprite1;
                                 if (sprite1 == null)
                                 if (sprite1 == null)
                                 {
                                 {
-                                    sprite = null;
+                                    SetSprite(null);
                                 }
                                 }
                                 else
                                 else
                                 {
                                 {
-                                    sprite = sprite1.GetSprite();
+                                    SetSprite(sprite1.GetSprite());
                                 }
                                 }
                             });
                             });
                         }
                         }
                         else
                         else
                         {
                         {
-                            sprite = loadSprite;
+                            SetSprite(loadSprite);
+                            
                         }
                         }
                     }
                     }
                 }
                 }
                 else
                 else
                 {
                 {
-                    sprite = loadSprite;
+                    SetSprite( loadSprite);
                 }
                 }
             }
             }
             else if (!string.IsNullOrEmpty(_icon_name) && sprite == null)
             else if (!string.IsNullOrEmpty(_icon_name) && sprite == null)
@@ -132,11 +133,11 @@ namespace UnityEngine.UI
                         _uiLoadSpriteHand = sprite1;
                         _uiLoadSpriteHand = sprite1;
                         if (sprite1 == null)
                         if (sprite1 == null)
                         {
                         {
-                            sprite = null;
+                            SetSprite(null);
                         }
                         }
                         else
                         else
                         {
                         {
-                            sprite = sprite1.GetSprite();
+                            SetSprite( sprite1.GetSprite());
                         }
                         }
                     });
                     });
                 }
                 }
@@ -171,16 +172,26 @@ namespace UnityEngine.UI
                         _uiLoadSpriteHand = sprite1;
                         _uiLoadSpriteHand = sprite1;
                         if (sprite1 == null)
                         if (sprite1 == null)
                         {
                         {
-                            sprite = null;
+                            SetSprite( null);
                         }
                         }
                         else
                         else
                         {
                         {
-                            sprite = sprite1.GetSprite();
+                            SetSprite(sprite1.GetSprite());
                         }
                         }
                     });
                     });
                 }
                 }
             }
             }
         }
         }
+
+        private void SetSprite(Sprite sprite)
+        {
+            this.sprite = sprite;
+            if (sprite != null)
+            {
+                onSpriteAlter?.Invoke();
+            }
+        }
+
         public override void GraphicUpdateComplete()
         public override void GraphicUpdateComplete()
         {
         {
             SetPack();
             SetPack();

+ 4 - 0
Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs

@@ -21,5 +21,9 @@
         /// 激活战斗
         /// 激活战斗
         /// </summary>
         /// </summary>
         ActiveCombat,
         ActiveCombat,
+        /// <summary>
+        /// 战斗里的Exp改变
+        /// </summary>
+        CombatExpAlter,
     }
     }
 }
 }

+ 2 - 1
Assets/Scripts/GameLogic/Combat/CombatEvent/CombatItemShowEventData.cs

@@ -10,6 +10,7 @@ namespace Common.Utility.CombatEvent
         public int count;
         public int count;
         // public List<string> showItem;
         // public List<string> showItem;
         public Vector3 startPos_WorldPos;
         public Vector3 startPos_WorldPos;
-        public bool isShowBag;
+        public string showName;
+        public bool isExp;
     }
     }
 }
 }

+ 4 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -26,6 +26,10 @@ namespace GameLogic.Combat.CombatTool
         public bool isUpdate;
         public bool isUpdate;
 
 
 
 
+        
+        
+        
+
         public CombatStateBasic CurrState
         public CombatStateBasic CurrState
         {
         {
             get { return stateControl.CurrIState as CombatStateBasic; }
             get { return stateControl.CurrIState as CombatStateBasic; }

+ 23 - 6
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -41,13 +41,19 @@ namespace GameLogic.Combat.CombatType
             set
             set
             {
             {
                 _exp = value;
                 _exp = value;
-                OnExpAlter?.Invoke();
+                CombatEventManager.Instance.Dispatch(CombatEventType.CombatExpAlter, null);
             }
             }
         }
         }
 
 
         private int _exp;
         private int _exp;
+
+        public int CurrMaxExp
+        {
+            get { return _levelBattleConfig.exp; }
+        }
+
         public bool isBossCombat;
         public bool isBossCombat;
-        public System.Action OnExpAlter;
+
 
 
         protected List<string> equipName = new List<string>()
         protected List<string> equipName = new List<string>()
         {
         {
@@ -62,6 +68,7 @@ namespace GameLogic.Combat.CombatType
         {
         {
             _levelBattleConfig = ConfigComponent.Instance.Get<LevelBattleConfig>(_startCombatInfo.levelBattleId);
             _levelBattleConfig = ConfigComponent.Instance.Get<LevelBattleConfig>(_startCombatInfo.levelBattleId);
             _currLevelBattleNodeIndex = 0;
             _currLevelBattleNodeIndex = 0;
+            exp = 0;
         }
         }
 
 
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
@@ -79,7 +86,7 @@ namespace GameLogic.Combat.CombatType
                 }
                 }
                 else if (combatHeroEntity.CurrCombatHeroInfo.heroType == 4) ///boss死了
                 else if (combatHeroEntity.CurrCombatHeroInfo.heroType == 4) ///boss死了
                 {
                 {
-                    exp = 0;
+                   
                     BossKo();
                     BossKo();
                 }
                 }
             }
             }
@@ -108,7 +115,6 @@ namespace GameLogic.Combat.CombatType
 
 
         private void ResurrectionFinish()
         private void ResurrectionFinish()
         {
         {
-            
             _isAwaitResurrection = false;
             _isAwaitResurrection = false;
             _currLevelBattleNodeIndex = 0;
             _currLevelBattleNodeIndex = 0;
             InitNewMonsterConfig();
             InitNewMonsterConfig();
@@ -125,7 +131,11 @@ namespace GameLogic.Combat.CombatType
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
             combatItemShowEventData.count = Random.Range(3, 5);
             combatItemShowEventData.count = Random.Range(3, 5);
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
+            combatItemShowEventData.showName = "icon_Coin";
+            combatItemShowEventData.isExp = false;
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
+
+
             List<string> allEquip = new List<string>();
             List<string> allEquip = new List<string>();
             for (int i = 0; i < 1; i++)
             for (int i = 0; i < 1; i++)
             {
             {
@@ -148,6 +158,12 @@ namespace GameLogic.Combat.CombatType
             EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
             EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
 
 
             exp += 5;
             exp += 5;
+            CombatItemShowEventData expItemShow = CombatItemShowEventData.Create();
+            expItemShow.count = Random.Range(3, 5);
+            expItemShow.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
+            expItemShow.showName = "icon_Energy";
+            expItemShow.isExp = true;
+            EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
             if (exp >= _levelBattleConfig.exp) // 到达目标值,开始打boss
             if (exp >= _levelBattleConfig.exp) // 到达目标值,开始打boss
             {
             {
                 StartBossCombat();
                 StartBossCombat();
@@ -208,7 +224,7 @@ namespace GameLogic.Combat.CombatType
             {
             {
                 _levelBattleConfig = levelBattleConfig;
                 _levelBattleConfig = levelBattleConfig;
             }
             }
-
+            exp = 0;
             _currLevelBattleNodeIndex = 0;
             _currLevelBattleNodeIndex = 0;
             InitNewMonsterConfig();
             InitNewMonsterConfig();
         }
         }
@@ -298,10 +314,11 @@ namespace GameLogic.Combat.CombatType
             if (_isAwaitResurrection)
             if (_isAwaitResurrection)
             {
             {
                 CombatHeroEntity[] myHero = combatController.CombatHeroController.GetHero(false);
                 CombatHeroEntity[] myHero = combatController.CombatHeroController.GetHero(false);
-                if (myHero!=null&&myHero.Length >= 4)
+                if (myHero != null && myHero.Length >= 4)
                 {
                 {
                     ResurrectionFinish();
                     ResurrectionFinish();
                 }
                 }
+
                 return;
                 return;
             }
             }
 
 

+ 5 - 2
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
+using Common.Utility.CombatEvent;
 using Excel2Json;
 using Excel2Json;
 using Fort23.UTool;
 using Fort23.UTool;
 using GameLogic.Hero;
 using GameLogic.Hero;
@@ -9,6 +10,7 @@ using Utility;
 public class PlayerManager : Singleton<PlayerManager>
 public class PlayerManager : Singleton<PlayerManager>
 {
 {
     public List<HeroInfo> heroList = new List<HeroInfo>();
     public List<HeroInfo> heroList = new List<HeroInfo>();
+
     /// <summary>
     /// <summary>
     /// 上阵的英雄,也可以叫主力,替补英雄等级=主力英雄的最低等级(和afk一样的)
     /// 上阵的英雄,也可以叫主力,替补英雄等级=主力英雄的最低等级(和afk一样的)
     /// </summary>
     /// </summary>
@@ -16,6 +18,8 @@ public class PlayerManager : Singleton<PlayerManager>
 
 
     public GameConstantConfig gameConstantConfig;
     public GameConstantConfig gameConstantConfig;
 
 
+    
+
     public void Init()
     public void Init()
     {
     {
         gameConstantConfig = ConfigComponent.Instance.Get<GameConstantConfig>(1);
         gameConstantConfig = ConfigComponent.Instance.Get<GameConstantConfig>(1);
@@ -32,6 +36,5 @@ public class PlayerManager : Singleton<PlayerManager>
             heroInfo.InitHero(heroData);
             heroInfo.InitHero(heroData);
             heroListInLead.Add(heroInfo);
             heroListInLead.Add(heroInfo);
         }
         }
-        
     }
     }
-}
+}

+ 29 - 4
Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -1,38 +1,63 @@
 using System.Threading.Tasks;
 using System.Threading.Tasks;
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
 using GameLogic.Hero;
 using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine;
 
 
 namespace Fort23.Mono
 namespace Fort23.Mono
 {
 {
-    [UIBinding(prefab = "MainUIPanel"  )]
+    [UIBinding(prefab = "MainUIPanel")]
     public partial class MainUIPanel : UIPanel
     public partial class MainUIPanel : UIPanel
     {
     {
         private void Init()
         private void Init()
         {
         {
             InitBattleHero();
             InitBattleHero();
         }
         }
+
         protected override void AddEvent()
         protected override void AddEvent()
         {
         {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
         }
         }
+
         protected override void DelEvent()
         protected override void DelEvent()
         {
         {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
         }
         }
+
         public override void AddButtonEvent()
         public override void AddButtonEvent()
         {
         {
         }
         }
 
 
+        private void CombatExpAlter(IEventData eventData)
+        {
+            ExpAlter();
+        }
 
 
-        private async void InitBattleHero()
+        private void ExpAlter()
         {
         {
+            if (CombatController.currActiveCombat == null || CombatController.currActiveCombat.CombatTypeBasic == null)
+            {
+                return;
+            }
+
+            LevelBattleCombatType levelBattleCombatType =
+                CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
+            float bl = (levelBattleCombatType.exp * 1.0f) / levelBattleCombatType.CurrMaxExp;
+            exp.value = bl;
+            TextExp.text = levelBattleCombatType.exp + "/" + levelBattleCombatType.CurrMaxExp;
+        }
 
 
+        private async void InitBattleHero()
+        {
             for (int i = 0; i < PlayerManager.Instance.heroListInLead.Count; i++)
             for (int i = 0; i < PlayerManager.Instance.heroListInLead.Count; i++)
             {
             {
                 RectTransform rectTransform = hero_battle[i] as RectTransform;
                 RectTransform rectTransform = hero_battle[i] as RectTransform;
-                WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null, 
+                WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null,
                     poolName: "WidgetHero", root: rectTransform);
                     poolName: "WidgetHero", root: rectTransform);
                 itemHero.InitHero(PlayerManager.Instance.heroListInLead[i]);
                 itemHero.InitHero(PlayerManager.Instance.heroListInLead[i]);
             }
             }
         }
         }
-
     }
     }
 }
 }

+ 47 - 0
Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine.UI;
 using UnityEngine;
 using UnityEngine;
 using System.Collections.Generic;
 using System.Collections.Generic;
+using TMPro;
+
 namespace Fort23.Mono
 namespace Fort23.Mono
 {
 {
 	public partial class MainUIPanel 
 	public partial class MainUIPanel 
@@ -41,6 +43,51 @@ namespace Fort23.Mono
 	      return _Icon_Coin;
 	      return _Icon_Coin;
 	     }
 	     }
 	   }
 	   }
+	  private RectTransform _expPoint;
+	  public RectTransform expPoint
+	   {
+	   get{
+	      if (_expPoint == null)
+	       {
+	         _expPoint  = GetUIUnit<RectTransform>("expPoint"); 
+	       }
+	      return _expPoint;
+	     }
+	   }
+	  private Slider _exp;
+	  public Slider exp
+	   {
+	   get{
+	      if (_exp == null)
+	       {
+	         _exp  = GetUIUnit<Slider>("exp"); 
+	       }
+	      return _exp;
+	     }
+	   }
+	  private TextMeshProUGUI _TextExp;
+	  
+	  public TextMeshProUGUI TextExp
+	   {
+	   get{
+	      if (_TextExp == null)
+	       {
+	         _TextExp  = GetUIUnit<TextMeshProUGUI>("TextExp"); 
+	       }
+	      return _TextExp;
+	     }
+	   }
+	  private TextMeshProUGUI _coinText;
+	  public TextMeshProUGUI coinText
+	   {
+	   get{
+	      if (_coinText == null)
+	       {
+	         _coinText  = GetUIUnit<TextMeshProUGUI>("coinText"); 
+	       }
+	      return _coinText;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{
 	{

+ 21 - 24
Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -36,7 +36,7 @@ namespace Fort23.Mono
                 target = showItemMoveToTargetPanel.transform.worldToLocalMatrix * target;
                 target = showItemMoveToTargetPanel.transform.worldToLocalMatrix * target;
             }
             }
 
 
-            showItemMoveToTargetPanel.ShowPanel(startPos, target, allItem.Count);
+            showItemMoveToTargetPanel.ShowPanel(startPos, target, allItem.Count, "");
         }
         }
 
 
         public static async void OpenShowItemMoveToTargetPanel(List<string> allItem)
         public static async void OpenShowItemMoveToTargetPanel(List<string> allItem)
@@ -45,14 +45,14 @@ namespace Fort23.Mono
                 await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Top, isFocus: false);
                 await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Top, isFocus: false);
             Vector2 target = showItemMoveToTargetPanel.moveTarget.GetComponent<RectTransform>().anchoredPosition;
             Vector2 target = showItemMoveToTargetPanel.moveTarget.GetComponent<RectTransform>().anchoredPosition;
             showItemMoveToTargetPanel.moveTarget.gameObject.SetActive(true);
             showItemMoveToTargetPanel.moveTarget.gameObject.SetActive(true);
-            showItemMoveToTargetPanel.ShowPanel(new Vector2(), target, allItem.Count);
+            showItemMoveToTargetPanel.ShowPanel(new Vector2(), target, allItem.Count, "");
         }
         }
 
 
         public static async void OpenShowItemMoveToTargetPanel(Vector2 startPos, Vector2 target, List<string> allItem)
         public static async void OpenShowItemMoveToTargetPanel(Vector2 startPos, Vector2 target, List<string> allItem)
         {
         {
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
                 await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Top, isFocus: false);
                 await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Top, isFocus: false);
-            showItemMoveToTargetPanel.ShowPanel(startPos, target, allItem.Count);
+            showItemMoveToTargetPanel.ShowPanel(startPos, target, allItem.Count, "");
         }
         }
 
 
         private void Init()
         private void Init()
@@ -77,16 +77,19 @@ namespace Fort23.Mono
 
 
         protected void Combat_ItemShow(IEventData iEventData)
         protected void Combat_ItemShow(IEventData iEventData)
         {
         {
-            CombatItemShowEventData combatItemShowEventData = iEventData as CombatItemShowEventData;
             Vector2 target = moveTarget.GetComponent<RectTransform>().anchoredPosition;
             Vector2 target = moveTarget.GetComponent<RectTransform>().anchoredPosition;
-            // moveTarget.gameObject.SetActive(true);
+            CombatItemShowEventData combatItemShowEventData = iEventData as CombatItemShowEventData;
+            if (combatItemShowEventData.isExp)
+            {
+                MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
+                Vector3 pos = mainUIPanel.expPoint.position;
+                target = transform.worldToLocalMatrix * pos;
+            }
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(
                 combatItemShowEventData.startPos_WorldPos);
                 combatItemShowEventData.startPos_WorldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
-            // RectTransform rectTransform=  moveIcon.GetComponent<RectTransform>();
-            // rectTransform.position = p2;
             Vector3 startPos = transform.worldToLocalMatrix * p2;
             Vector3 startPos = transform.worldToLocalMatrix * p2;
-            ShowPanel(startPos, target, combatItemShowEventData.count);
+            ShowPanel(startPos, target, combatItemShowEventData.count, combatItemShowEventData.showName);
         }
         }
 
 
         protected void RenderUpdateCallBack()
         protected void RenderUpdateCallBack()
@@ -151,9 +154,14 @@ namespace Fort23.Mono
             gameObjectPool.own.SetActive(false);
             gameObjectPool.own.SetActive(false);
             gameObjectPool.own.transform.localScale = Vector3.zero;
             gameObjectPool.own.transform.localScale = Vector3.zero;
             currImageMove.GameObjectPool = gameObjectPool;
             currImageMove.GameObjectPool = gameObjectPool;
-            // gameObjectPool.own.GetComponent<MyImage>().icon_name = itemConfig;
+            MyImage myImage= gameObjectPool.own.GetComponent<MyImage>();
+            myImage.onSpriteAlter= delegate
+            {
+                myImage.SetNativeSize();
+            };
+            myImage.icon_name = itemConfig;
             currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
             currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
-            currImageMove.transform.sizeDelta = new Vector2(35, 35);
+            // currImageMove.transform.sizeDelta = new Vector2(35, 35);
             currImageMove.moveStartPos = startPos;
             currImageMove.moveStartPos = startPos;
             currImageMove.moveTargetPos = moveTargetPos;
             currImageMove.moveTargetPos = moveTargetPos;
             currImageMove.transform.anchoredPosition = currImageMove.moveStartPos;
             currImageMove.transform.anchoredPosition = currImageMove.moveStartPos;
@@ -164,27 +172,16 @@ namespace Fort23.Mono
             allImageMove.Add(currImageMove);
             allImageMove.Add(currImageMove);
         }
         }
 
 
-        public void ShowPanel(Vector2 startPos, Vector2 target,int count)
+        public void ShowPanel(Vector2 startPos, Vector2 target, int count, string showName)
         {
         {
-            // if (allItem.Count < 5)
-            // {
-            //     for (int i = allItem.Count; i <= 5; i++)
-            //     {
-            //         allItem.Add(allItem[Random.Range(0, allItem.Count)]);
-            //     }
-            // }
-
             if (target.x == -5000)
             if (target.x == -5000)
             {
             {
                 target = moveTarget.GetComponent<RectTransform>().anchoredPosition;
                 target = moveTarget.GetComponent<RectTransform>().anchoredPosition;
             }
             }
 
 
-
-            for (int i = 0; i <count; i++)
+            for (int i = 0; i < count; i++)
             {
             {
-                string item = "count";
-
-                AddACurve(startPos, target, item);
+                AddACurve(startPos, target, showName);
             }
             }
         }
         }
     }
     }

+ 1 - 1
UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"ace5466faa841bb7b9046587aae54d38"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"03b3872585b24d54f63b884a410da2bc"}],"isJiaoYan":true}

BIN
美术/art_use_ui/all/icon_Coin.png


BIN
美术/art_use_ui/all/icon_Energy.png


BIN
美术/art_use_ui/all/icon_Gem.png


File diff suppressed because it is too large
+ 0 - 0
美术/unity_use_ui/TextrueJson/all.txt


BIN
美术/unity_use_ui/icon/icon_Coin.png


BIN
美术/unity_use_ui/icon/icon_Energy.png


BIN
美术/unity_use_ui/icon/icon_Gem.png


Some files were not shown because too many files changed in this diff