修改bug

Assets/Art/UIAssets/TextrueJson/heroIcon.txt

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}

Assets/Art/UIAssets/TextrueJson/skillIcon.txt

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}

Assets/Art/UIAssets/decorate/dec_PanelFrame03_Bg.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 2, y: 13, z: 2, w: 6}
+  spriteBorder: {x: 1, y: 8, z: 1, w: 9}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -112,6 +112,34 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    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: HMIAndroid
+    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: []

Assets/Art/UIAssets/decorate/dec_Popup09_Bg.png.meta

@@ -0,0 +1,161 @@
+fileFormatVersion: 2
+guid: CixMsyP8VygjLn6mVfgfv+wrusg3gfEuh1JljWF8AJhmB6bhj4WpIi0=
+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: 33, y: 0, z: 33, 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: Android
+    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: HMIAndroid
+    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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UIAssets/decorate/dec_Popup09_Bg_Inner.png.meta

@@ -0,0 +1,161 @@
+fileFormatVersion: 2
+guid: B34cti+sUnj1V2LSbIjW8ZchKSLShEyp+xsSkivhKxdxY9nb8arxwHs=
+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: 22, y: 0, z: 22, 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: Android
+    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: HMIAndroid
+    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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/SkillConfig.json

@@ -76,7 +76,7 @@
       "scriptName": "",
       "IDGroup": 10002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -93,7 +93,7 @@
       "scriptName": "",
       "IDGroup": 10002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -110,7 +110,7 @@
       "scriptName": "",
       "IDGroup": 10002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -127,7 +127,7 @@
       "scriptName": "",
       "IDGroup": 10002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,
@@ -144,7 +144,7 @@
       "scriptName": "",
       "IDGroup": 10003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -161,7 +161,7 @@
       "scriptName": "",
       "IDGroup": 10003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -178,7 +178,7 @@
       "scriptName": "",
       "IDGroup": 10003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -195,7 +195,7 @@
       "scriptName": "",
       "IDGroup": 10003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,
@@ -384,7 +384,7 @@
       "scriptName": "",
       "IDGroup": 30002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -401,7 +401,7 @@
       "scriptName": "",
       "IDGroup": 30002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -418,7 +418,7 @@
       "scriptName": "",
       "IDGroup": 30002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -435,7 +435,7 @@
       "scriptName": "",
       "IDGroup": 30002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,
@@ -452,7 +452,7 @@
       "scriptName": "",
       "IDGroup": 30003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -469,7 +469,7 @@
       "scriptName": "",
       "IDGroup": 30003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -486,7 +486,7 @@
       "scriptName": "",
       "IDGroup": 30003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -503,7 +503,7 @@
       "scriptName": "",
       "IDGroup": 30003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,
@@ -688,7 +688,7 @@
       "scriptName": "",
       "IDGroup": 20002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -705,7 +705,7 @@
       "scriptName": "",
       "IDGroup": 20002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -722,7 +722,7 @@
       "scriptName": "",
       "IDGroup": 20002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -739,7 +739,7 @@
       "scriptName": "",
       "IDGroup": 20002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,
@@ -756,7 +756,7 @@
       "scriptName": "",
       "IDGroup": 20003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -773,7 +773,7 @@
       "scriptName": "",
       "IDGroup": 20003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -790,7 +790,7 @@
       "scriptName": "",
       "IDGroup": 20003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -807,7 +807,7 @@
       "scriptName": "",
       "IDGroup": 20003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,
@@ -945,7 +945,7 @@
       "name": 60,
       "desc": 56,
       "effectValue": [
-        333.333344
+        66.6666641
       ]
     },
     {
@@ -959,7 +959,7 @@
       "name": 60,
       "desc": 57,
       "effectValue": [
-        366.666656
+        73.3333359
       ]
     },
     {
@@ -973,7 +973,7 @@
       "name": 60,
       "desc": 58,
       "effectValue": [
-        400.0
+        80.0
       ]
     },
     {
@@ -987,7 +987,7 @@
       "name": 60,
       "desc": 59,
       "effectValue": [
-        433.333344
+        86.6666641
       ]
     },
     {
@@ -996,7 +996,7 @@
       "scriptName": "",
       "IDGroup": 40002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -1013,7 +1013,7 @@
       "scriptName": "",
       "IDGroup": 40002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -1030,7 +1030,7 @@
       "scriptName": "",
       "IDGroup": 40002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -1047,7 +1047,7 @@
       "scriptName": "",
       "IDGroup": 40002,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,
@@ -1064,7 +1064,7 @@
       "scriptName": "",
       "IDGroup": 40003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 1,
       "name": null,
       "desc": null,
@@ -1081,7 +1081,7 @@
       "scriptName": "",
       "IDGroup": 40003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 2,
       "name": null,
       "desc": null,
@@ -1098,7 +1098,7 @@
       "scriptName": "",
       "IDGroup": 40003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 3,
       "name": null,
       "desc": null,
@@ -1115,7 +1115,7 @@
       "scriptName": "",
       "IDGroup": 40003,
       "cd": null,
-      "SkillType": 4,
+      "SkillType": 5,
       "level": 4,
       "name": null,
       "desc": null,

Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,80 +11,82 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
-    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
-    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
-    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
     - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
+    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
+    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
+    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
+    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
+    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
+    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
     - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
     - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
+    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
+    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
+    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
+    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
     - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
     - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, 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: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, 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: 92cd22df52f4e473a89701d0395c71ac, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
-    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
     - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, 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: b585079c6bd658f4e937b4f0468e8091, type: 3}
+    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
+    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
+    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, 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: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
     - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
-    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
-    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
-    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -46,7 +46,7 @@ public int cd;
 
 
 		/// <summary>
-		///技能类型: 1= 基础 2= 小招 3= 大招 4= 被动 5= 觉醒新技能效果|专属遗物效果 6 =职业被动 7 =神器光明强化 8 =神器黑暗强化
+		///技能类型: 1= 基础 2= 小招 3= 大招 4= 被动 5= 简单被动(加属性) 6 =职业被动 7 =觉醒新技能效果|专属遗物效果
 		/// </summary>
 public int SkillType;
 

Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPre.cs

@@ -120,12 +120,25 @@ namespace Fort23.Mono
                 starsPos.localPosition = new Vector3(0, GlobalParam.Hero_Promote_UI_BG_Star_Pos_2, 0);
                 
                 skillConfig = nextLvInfo.SkillData.GetSkillConfig(upConfig.ID);
-                
-                object[] data = new object[skillConfig.effectValue.Length];
-                for (int j = 0; j < skillConfig.effectValue.Length; j++)
+                object[] data = null;
+                if (skillConfig.SkillType == 5)
                 {
-                    data[j] = skillConfig.effectValue[j];
+                    data = new object[skillConfig.addPropertyValue.Length];
+                    for (int j = 0; j < skillConfig.addPropertyValue.Length; j++)
+                    {
+                        data[j] = skillConfig.addPropertyValue[j];
+                    }
                 }
+                else
+                {
+                    data = new object[skillConfig.effectValue.Length];
+                    for (int j = 0; j < skillConfig.effectValue.Length; j++)
+                    {
+                        data[j] = skillConfig.effectValue[j];
+                    }
+                }
+                
+
 
                 imgNewSkill4Pro.icon_name = skillConfig.icon;
                 txtSkillName4Pro.text = LanguageManager.Instance.Text(skillConfig.name);

UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"55e8a40523c8eed12497fdfd32533577"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"94128d0dbe9cd8207418b750524ba469"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"ad234b510c8665e34d281ca3122c266c"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"e21daa5d31e00b95876c58a9ce604a30"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"94128d0dbe9cd8207418b750524ba469"}],"isJiaoYan":true}

UserSettings/EditorUserSettings.asset

@@ -42,13 +42,13 @@ EditorUserSettings:
       value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

美术/unity_use_ui/TextrueJson/heroIcon.txt

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}

美术/unity_use_ui/TextrueJson/skillIcon.txt

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"}],"keyToValue":{}}

美术/工具/imgui.ini

@@ -10,27 +10,27 @@ Collapsed=0
 
 [Window][Tool]
 Pos=400,0
-Size=709,100
+Size=900,100
 Collapsed=0
 
 [Window][unity_art]
-Pos=1109,0
+Pos=1300,0
 Size=400,720
 Collapsed=0
 
 [Window][console]
 Pos=400,520
-Size=709,70
+Size=900,70
 Collapsed=0
 
 [Window][控制台]
 Pos=400,590
-Size=709,130
+Size=900,130
 Collapsed=0
 
 [Window][scence]
 Pos=400,100
-Size=709,420
+Size=900,420
 Collapsed=0
 
 [Docking][Data]