Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt

Assets/Res/UI/HeroInformainPanel/修炼-渡劫成功.png.meta → Assets/Art/UIAssets/decorate/dec_lingdang_db.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CX0asiylBynkya1VbEAFmvcpf4+FUP0bjeEWGBwsmh/+LsAXHSsL00SgL1Or
+guid: DShM5y+oVXISjmgr1YJZRCv53AuIpmpDJiMVVfAtltq+hw8DL8tFXJIEuPiE
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CChKsHyrVXvrQhHke3OP0qSNFhV94wWRdpdSs0rwpmxU6XM48T7tj9L979OW
+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: iPhone
+    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: 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
+  - 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
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    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: 

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.2050029
+    - _Alpha: 0.2087822
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20611608
+    - _MainTexOffsetU: 0.20158291
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/BuffConfig.json

@@ -5,8 +5,8 @@
       "nameTest": "寒气",
       "decTest": "每到寒气对敌人的功法运转速度降低{0}%",
       "icon": "icon_b1001",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10721,
+      "buffEffectDes": 10754,
       "buffGroup": 1001,
       "overlayCount": 15,
       "effectValue": [
@@ -25,8 +25,8 @@
       "nameTest": "冻结",
       "decTest": "敌人不能做任何作用，功法将会被封住。",
       "icon": "icon_b1002",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10722,
+      "buffEffectDes": 10755,
       "buffGroup": 1002,
       "overlayCount": 1,
       "effectValue": [
@@ -45,8 +45,8 @@
       "nameTest": "毒",
       "decTest": "每层毒对敌人每秒照成{0}%木属性伤害，{1}层毒时毒气会入侵五脏,敌人每使用一次功法对应功法的伤势增加1",
       "icon": "icon_b1003",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10723,
+      "buffEffectDes": 10756,
       "buffGroup": 1003,
       "overlayCount": 15,
       "effectValue": [
@@ -67,8 +67,8 @@
       "nameTest": "灼热",
       "decTest": "对敌人照成{0}火属性灼烧伤害，满层时敌人会受到痛苦，敌人使用功法时自身受到当前生命{1}%伤害",
       "icon": "icon_b1005",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10725,
+      "buffEffectDes": 10758,
       "buffGroup": 1005,
       "overlayCount": 15,
       "effectValue": [
@@ -88,8 +88,8 @@
       "nameTest": "昏厥",
       "decTest": "敌人眩晕状态不能做任何事",
       "icon": "icon_b1006",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10726,
+      "buffEffectDes": 10759,
       "buffGroup": 1006,
       "overlayCount": 1,
       "effectValue": [
@@ -108,8 +108,8 @@
       "nameTest": "剑意",
       "decTest": "剑祖的剑意标记",
       "icon": "icon_b1007",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10727,
+      "buffEffectDes": 10760,
       "buffGroup": 1007,
       "overlayCount": 50,
       "effectValue": [
@@ -128,8 +128,8 @@
       "nameTest": "封禁",
       "decTest": "法宝封禁不能充能，不能使用",
       "icon": "icon_b1008",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10728,
+      "buffEffectDes": 10761,
       "buffGroup": 1008,
       "overlayCount": 1,
       "effectValue": [
@@ -148,8 +148,8 @@
       "nameTest": "五行混乱",
       "decTest": "敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算",
       "icon": "icon_b1009",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10729,
+      "buffEffectDes": 10762,
       "buffGroup": 1009,
       "overlayCount": 1,
       "effectValue": [
@@ -168,8 +168,8 @@
       "nameTest": "流血",
       "decTest": "敌人持续流血{0}金属性伤害，满层后每隔{1}秒放血一次",
       "icon": "icon_b1011",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10731,
+      "buffEffectDes": 10764,
       "buffGroup": 1011,
       "overlayCount": 15,
       "effectValue": [
@@ -189,8 +189,8 @@
       "nameTest": "放血",
       "decTest": "敌人受到一次大量{0}%金属性命值伤害，后续流血伤害提升{1}%",
       "icon": "icon_b1012",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10732,
+      "buffEffectDes": 10765,
       "buffGroup": 1012,
       "overlayCount": 1,
       "effectValue": [
@@ -210,8 +210,8 @@
       "nameTest": "土沙",
       "decTest": "每一层土沙降低敌人{0}%防御",
       "icon": "icon_b1013",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10733,
+      "buffEffectDes": 10766,
       "buffGroup": 1013,
       "overlayCount": 15,
       "effectValue": [
@@ -230,8 +230,8 @@
       "nameTest": "无敌",
       "decTest": "无敌，不受到任何伤害，不受控制",
       "icon": "icon_b1015",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10735,
+      "buffEffectDes": 10768,
       "buffGroup": 1015,
       "overlayCount": 1,
       "effectValue": [
@@ -250,8 +250,8 @@
       "nameTest": "冰魄牢域",
       "decTest": "乌龟的技能，神龟的所有主动伤害型技能命中目标后都会施加一层寒气，\n寒气每叠到{0}层时，消耗所有层寒气对敌人照成{0}秒的冰冻效果",
       "icon": "icon_b1016",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10736,
+      "buffEffectDes": 10769,
       "buffGroup": 1016,
       "overlayCount": 1,
       "effectValue": [
@@ -271,8 +271,8 @@
       "nameTest": "鼠疫",
       "decTest": "敌人受到每秒受到{0}*层数的伤害，持续期间攻击力降低{1}%*层数",
       "icon": "icon_b1017",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10737,
+      "buffEffectDes": 10770,
       "buffGroup": 1017,
       "overlayCount": 15,
       "effectValue": [
@@ -292,8 +292,8 @@
       "nameTest": "感电",
       "decTest": "麻痹敌人，敌人的身体受到麻痹，有{0}%*层数的概率是功法无法进入释放状态,没触发一次，消耗一半感电",
       "icon": "icon_b1018",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10738,
+      "buffEffectDes": 10771,
       "buffGroup": 1018,
       "overlayCount": 10,
       "effectValue": [
@@ -312,8 +312,8 @@
       "nameTest": "筋脉封锁金",
       "decTest": "封锁筋脉",
       "icon": "icon_b1019",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10739,
+      "buffEffectDes": 10772,
       "buffGroup": 1019,
       "overlayCount": 1,
       "effectValue": [
@@ -332,8 +332,8 @@
       "nameTest": "筋脉封锁木",
       "decTest": "封锁筋脉",
       "icon": "icon_b1020",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10740,
+      "buffEffectDes": 10773,
       "buffGroup": 1020,
       "overlayCount": 1,
       "effectValue": [
@@ -352,8 +352,8 @@
       "nameTest": "筋脉封锁水",
       "decTest": "封锁筋脉",
       "icon": "icon_b1021",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10741,
+      "buffEffectDes": 10774,
       "buffGroup": 1021,
       "overlayCount": 1,
       "effectValue": [
@@ -372,8 +372,8 @@
       "nameTest": "筋脉封锁火",
       "decTest": "封锁筋脉",
       "icon": "icon_b1022",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10742,
+      "buffEffectDes": 10775,
       "buffGroup": 1022,
       "overlayCount": 1,
       "effectValue": [
@@ -392,8 +392,8 @@
       "nameTest": "筋脉封锁土",
       "decTest": "封锁筋脉",
       "icon": "icon_b1023",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10743,
+      "buffEffectDes": 10776,
       "buffGroup": 1023,
       "overlayCount": 1,
       "effectValue": [
@@ -412,8 +412,8 @@
       "nameTest": "星辰印记",
       "decTest": "星辰道升级获得的效果，在结算时收到层数对应的伤害",
       "icon": "icon_b1024",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10744,
+      "buffEffectDes": 10777,
       "buffGroup": 1024,
       "overlayCount": 99,
       "effectValue": [
@@ -432,8 +432,8 @@
       "nameTest": "控制",
       "decTest": "不能释放功法，功法也不能充能完成",
       "icon": "icon_b1025",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10745,
+      "buffEffectDes": 10778,
       "buffGroup": 1025,
       "overlayCount": 99,
       "effectValue": [
@@ -452,8 +452,8 @@
       "nameTest": "大树隐身状态",
       "decTest": "大树隐身状态",
       "icon": "icon_b1026",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10746,
+      "buffEffectDes": 10779,
       "buffGroup": 1026,
       "overlayCount": 99,
       "effectValue": [
@@ -472,8 +472,8 @@
       "nameTest": "阴水",
       "decTest": "",
       "icon": "icon_b1027",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10747,
+      "buffEffectDes": 10780,
       "buffGroup": 1027,
       "overlayCount": 99,
       "effectValue": [
@@ -492,8 +492,8 @@
       "nameTest": "冰冻值",
       "decTest": "",
       "icon": "icon_b1028",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10748,
+      "buffEffectDes": 10781,
       "buffGroup": 1028,
       "overlayCount": 99,
       "effectValue": [
@@ -512,8 +512,8 @@
       "nameTest": "金伤势",
       "decTest": "影响金的灵根",
       "icon": "icon_b1029",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10749,
+      "buffEffectDes": 10782,
       "buffGroup": 1029,
       "overlayCount": 15,
       "effectValue": [
@@ -532,8 +532,8 @@
       "nameTest": "木伤势",
       "decTest": "影响木的灵根",
       "icon": "icon_b1030",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10750,
+      "buffEffectDes": 10783,
       "buffGroup": 1030,
       "overlayCount": 15,
       "effectValue": [
@@ -552,8 +552,8 @@
       "nameTest": "水伤势",
       "decTest": "影响水的灵根",
       "icon": "icon_b1031",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10751,
+      "buffEffectDes": 10784,
       "buffGroup": 1031,
       "overlayCount": 15,
       "effectValue": [
@@ -572,8 +572,8 @@
       "nameTest": "火伤势",
       "decTest": "影响火的灵根",
       "icon": "icon_b1032",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10752,
+      "buffEffectDes": 10785,
       "buffGroup": 1032,
       "overlayCount": 15,
       "effectValue": [
@@ -592,8 +592,8 @@
       "nameTest": "土伤势",
       "decTest": "影响土的灵根",
       "icon": "icon_b1033",
-      "buffName": 500003,
-      "buffEffectDes": 500044,
+      "buffName": 10753,
+      "buffEffectDes": 10786,
       "buffGroup": 1033,
       "overlayCount": 15,
       "effectValue": [

Assets/Res/Config/HeroModelConfig.json

@@ -1513,11 +1513,11 @@
       "headicon": "icon_tx7004",
       "model": "Boss01",
       "isUseGpu": false,
-      "heroType": 4,
-      "attack": 110,
-      "hp": 130,
+      "heroType": 3,
+      "attack": 65,
+      "hp": 121,
       "def": 100,
-      "shield": 100,
+      "shield": 93,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/LanguageChineseConfig_skill.json

@@ -2058,7 +2058,7 @@
     },
     {
       "ID": 1111010,
-      "txt": "身体周围幻化出{0}柄细剑，每柄细剑对敌人造成{1}%伤害，并有{2}几率对敌人造成1层流血。"
+      "txt": "身体周围幻化出{0}柄细剑，每柄细剑对敌人造成{1}%伤害，并有{2}%的几率对敌人造成1层流血。"
     },
     {
       "ID": 1111011,
@@ -2070,63 +2070,63 @@
     },
     {
       "ID": 1111013,
-      "txt": "身体周围幻化出{0}柄细剑，每柄细剑对敌人造成{1}%伤害，并有{2}几率对敌人造成1层流血。\n如果敌人有减益状态，则虚剑伤害提升{3}%。"
+      "txt": "身体周围幻化出{0}柄细剑，每柄细剑对敌人造成{1}%伤害，并有{2}几率对敌人造成1层流血。\n如果敌人有减益状态，则细剑伤害提升{3}%。"
     },
     {
       "ID": 1111014,
-      "txt": "身体周围幻化出{0}柄细剑，每柄细剑对敌人造成{1}%伤害，并有{2}几率对敌人造成1层流血。\n如果敌人有减益状态，则虚剑伤害提升{3}%。"
+      "txt": "身体周围幻化出{0}柄细剑，每柄细剑对敌人造成{1}%伤害，并有{2}几率对敌人造成1层流血。\n如果敌人有减益状态，则细剑伤害提升{3}%。"
     },
     {
       "ID": 1111015,
-      "txt": "身体周围幻化出{0}柄更大体型的虚剑，每柄虚剑对敌人造成{1}%伤害，并有{2}几率对敌人造成1层流血。\n如果敌人有减益状态，则虚剑伤害提升{3}%。"
+      "txt": "身体周围幻化出{0}柄更加巨大的虚剑，每柄虚剑对敌人造成{1}%伤害，并有{2}几率对敌人造成1层流血。\n如果敌人有减益状态，则虚剑伤害提升{3}%。"
     },
     {
       "ID": 1111020,
-      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害"
+      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对其照成{1}%伤害"
     },
     {
       "ID": 1111021,
-      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n敌人如果在流血或放血状态，对敌人造成的伤害+{2}%"
+      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对其照成{1}%伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%"
     },
     {
       "ID": 1111022,
-      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n敌人如果在流血或放血状态，对敌人造成的伤害+{2}%"
+      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对其照成{1}%伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%"
     },
     {
       "ID": 1111023,
-      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n敌人如果在流血或放血状态，对敌人造成的伤害+{2}%\n重伤敌人后，如果目标没在放血状态，直接放血且不消耗流血层数"
+      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后，如果目标没在放血状态，直接放血且不消耗流血层数"
     },
     {
       "ID": 1111024,
-      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n敌人如果在流血或放血状态，对敌人造成的伤害+{2}%\n重伤敌人后，如果目标没在放血状态，直接放血且不消耗流血层数"
+      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后，如果目标没在放血状态，直接放血且不消耗流血层数"
     },
     {
       "ID": 1111025,
-      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n敌人如果在流血或放血状态，对敌人造成的伤害+{2}%\n重伤敌人后，如果目标没在放血状态，直接放血且不消耗流血层数\n全盛状态，剑的体型变大，对拼强度+{3}%，伤害提升{4}%"
+      "txt": "吸收自身灵气凝聚{0}柄大剑，大剑旋转快速穿透敌人对敌人照成{1}%伤害\n对处在流血或放血状态下的敌人造成的伤害+{2}%\n重伤敌人后，如果目标没在放血状态，直接放血且不消耗流血层数\n巨剑进入全盛状态体型变大，对拼强度+{3}%，伤害提升{4}%"
     },
     {
       "ID": 1111030,
-      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人{1}造成伤害，并有{2}%概率对敌人造成流血。"
+      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人造成{1}伤害，并有{2}%概率对敌人造成流血。"
     },
     {
       "ID": 1111031,
-      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人{1}造成伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人造成{1}伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111032,
-      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人{1}造成伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人造成{1}伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111033,
-      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人{1}造成伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人造成{1}伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111034,
-      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人{1}造成伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
+      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人造成{1}伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。"
     },
     {
       "ID": 1111035,
-      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人{1}造成伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。\n刀气对流血的敌人额外造成{4}%伤害"
+      "txt": "向前方挥动{0}次，每次挥动形成一道血刃刀气，对敌人造成{1}伤害，并有{2}%概率对敌人造成流血。\n刀气命中目标后，恢复本次伤害{3}%的生命。\n刀气对流血状态下的敌人造成伤害+{4}%"
     },
     {
       "ID": 1111040,
@@ -2178,27 +2178,27 @@
     },
     {
       "ID": 1112010,
-      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每到冰锥有{2}%概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每道冰锥有{2}%概率对敌人施加1层寒气"
     },
     {
       "ID": 1112011,
-      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每到冰锥有{2}%概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每道冰锥有{2}%概率对敌人施加1层寒气"
     },
     {
       "ID": 1112012,
-      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每到冰锥有{2}%概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每道冰锥有{2}%概率对敌人施加1层寒气"
     },
     {
       "ID": 1112013,
-      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每到冰锥有{2}%概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每道冰锥有{2}%概率对敌人施加1层寒气"
     },
     {
       "ID": 1112014,
-      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每到冰锥有{2}%概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每道冰锥有{2}%概率对敌人施加1层寒气"
     },
     {
       "ID": 1112015,
-      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每到冰锥有{2}%概率对敌人施加1层寒气"
+      "txt": "发出{0}道寒气冰锥，对敌人照成{1}%伤害，每道冰锥有{2}%概率对敌人施加1层寒气"
     },
     {
       "ID": 1112020,
@@ -2298,27 +2298,27 @@
     },
     {
       "ID": 1113020,
-      "txt": "快手释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113021,
-      "txt": "快手释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113022,
-      "txt": "快手释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113023,
-      "txt": "快手释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113024,
-      "txt": "快手释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113025,
-      "txt": "快手释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
+      "txt": "迅速释放{0}掌，对敌人造成{1}%伤害，并对敌人施加1层毒,每层毒额外提高{2}%伤害"
     },
     {
       "ID": 1113040,
@@ -2370,27 +2370,27 @@
     },
     {
       "ID": 1114010,
-      "txt": "向前方发出{0}柄剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
     },
     {
       "ID": 1114011,
-      "txt": "向前方发出{0}柄剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
     },
     {
       "ID": 1114012,
-      "txt": "向前方发出{0}柄剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
     },
     {
       "ID": 1114013,
-      "txt": "向前方发出{0}柄剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
     },
     {
       "ID": 1114014,
-      "txt": "向前方发出{0}柄剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
+      "txt": "向前方发出{0}柄飞剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。"
     },
     {
       "ID": 1114015,
-      "txt": "向前方发出{0}柄剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。\n每柄烈焰剑将会对敌人照成爆燃，爆燃额外受到{3}%伤害"
+      "txt": "向前方发出{0}柄飞剑，对敌人造成{1}%火系伤害，并有{2}%的概率施加1层灼烧。\n每柄烈焰剑将会对敌人照成爆燃，爆燃额外受到{3}%伤害"
     },
     {
       "ID": 1114020,
@@ -2586,51 +2586,51 @@
     },
     {
       "ID": 1120010,
-      "txt": "引星辰之力入体，增强玩家体魄，\n让后方槽位的功法无视防御性护盾（功法法宝带来的防护罩、自身护盾）"
+      "txt": "引星辰之力入体，增强体魄，\n使后方槽位的功法无视功法法宝带来的防护罩、自身护盾"
     },
     {
       "ID": 1120011,
-      "txt": "引星辰之力入体，增强玩家体魄，\n让后方槽位的功法无视防御性护盾（功法法宝带来的防护罩、自身护盾）"
+      "txt": "引星辰之力入体，增强体魄，\n使后方槽位的功法无视功法法宝带来的防护罩、自身护盾"
     },
     {
       "ID": 1120012,
-      "txt": "引星辰之力入体，增强玩家体魄，\n让后方槽位的功法无视防御性护盾（功法法宝带来的防护罩、自身护盾）"
+      "txt": "引星辰之力入体，增强体魄，\n使后方槽位的功法无视功法法宝带来的防护罩、自身护盾"
     },
     {
       "ID": 1120013,
-      "txt": "引星辰之力入体，增强玩家体魄，\n让后方槽位的功法无视防御性护盾（功法法宝带来的防护罩、自身护盾）"
+      "txt": "引星辰之力入体，增强体魄，\n使后方槽位的功法无视功法法宝带来的防护罩、自身护盾"
     },
     {
       "ID": 1120014,
-      "txt": "引星辰之力入体，增强玩家体魄，\n让后方槽位的功法无视防御性护盾（功法法宝带来的防护罩、自身护盾）"
+      "txt": "引星辰之力入体，增强体魄，\n使后方槽位的功法无视功法法宝带来的防护罩、自身护盾"
     },
     {
       "ID": 1120015,
-      "txt": "引星辰之力入体，增强玩家体魄，\n让后方槽位的功法无视防御性护盾（功法法宝带来的防护罩、自身护盾）"
+      "txt": "引星辰之力入体，增强体魄，\n使后方槽位的功法无视功法法宝带来的防护罩、自身护盾"
     },
     {
       "ID": 1120020,
-      "txt": "后方槽位技能在击中目标时，为法宝提供{0}%充能"
+      "txt": "后方槽位功法命中目标后，为法宝提供{0}%的充能"
     },
     {
       "ID": 1120021,
-      "txt": "后方槽位技能在击中目标时，为法宝提供{0}%充能"
+      "txt": "后方槽位功法命中目标后，为法宝提供{0}%的充能"
     },
     {
       "ID": 1120022,
-      "txt": "后方槽位技能在击中目标时，为法宝提供{0}%充能"
+      "txt": "后方槽位功法命中目标后，为法宝提供{0}%的充能"
     },
     {
       "ID": 1120023,
-      "txt": "后方槽位技能在击中目标时，为法宝提供{0}%充能"
+      "txt": "后方槽位功法命中目标后，为法宝提供{0}%的充能"
     },
     {
       "ID": 1120024,
-      "txt": "后方槽位技能在击中目标时，为法宝提供{0}%充能"
+      "txt": "后方槽位功法命中目标后，为法宝提供{0}%的充能"
     },
     {
       "ID": 1120025,
-      "txt": "后方槽位技能在击中目标时，为法宝提供{0}%充能。\n法宝可以瞬间施放，且规避法宝对拼。"
+      "txt": "后方槽位功法命中目标后，为法宝提供{0}%的充能。\n法宝可以瞬间施放，且规避法宝对拼。"
     },
     {
       "ID": 1120030,
@@ -2682,195 +2682,195 @@
     },
     {
       "ID": 1120050,
-      "txt": "每层经过火经脉时使火系功法伤害提升{0}%，最多叠加{1}层"
+      "txt": "功法每次经过火属性经脉使火系功法伤害提升{0}%，最多叠加{1}层"
     },
     {
       "ID": 1120051,
-      "txt": "每层经过火经脉时使火系功法伤害提升{0}%，最多叠加{1}层"
+      "txt": "功法每次经过火属性经脉使火系功法伤害提升{0}%，最多叠加{1}层"
     },
     {
       "ID": 1120052,
-      "txt": "每层经过火经脉时使火系功法伤害提升{0}%，最多叠加{1}层"
+      "txt": "功法每次经过火属性经脉使火系功法伤害提升{0}%，最多叠加{1}层"
     },
     {
       "ID": 1120053,
-      "txt": "每层经过火经脉时使火系功法伤害提升{0}%，最多叠加{1}层"
+      "txt": "功法每次经过火属性经脉使火系功法伤害提升{0}%，最多叠加{1}层"
     },
     {
       "ID": 1120054,
-      "txt": "每层经过火经脉时使火系功法伤害提升{0}%，最多叠加{1}层"
+      "txt": "功法每次经过火属性经脉使火系功法伤害提升{0}%，最多叠加{1}层"
     },
     {
       "ID": 1120055,
-      "txt": "每层经过火经脉时使火系功法伤害提升{0}%，最多叠加{1}层。\n当达到满层后，任何火系功法命中时都会施加{1}层灼烧。"
+      "txt": "功法每次经过火属性经脉使火系功法伤害提升{0}%，最多叠加{1}层。\n当达到满层后，任何火系功法命中后都会施加{1}层灼烧。"
     },
     {
       "ID": 1120060,
-      "txt": "后方槽位第一个技能体型巨大化，且在对碰中强度增加{0}%"
+      "txt": "使后方功法体型巨大化，且在对碰中强度增加{0}%"
     },
     {
       "ID": 1120061,
-      "txt": "后方槽位第一个技能体型巨大化，且在对碰中强度增加{0}%"
+      "txt": "使后方功法体型巨大化，且在对碰中强度增加{0}%"
     },
     {
       "ID": 1120062,
-      "txt": "后方槽位第一个技能体型巨大化，且在对碰中强度增加{0}%"
+      "txt": "使后方功法体型巨大化，且在对碰中强度增加{0}%"
     },
     {
       "ID": 1120063,
-      "txt": "后方槽位第一个技能体型巨大化，且在对碰中强度增加{0}%"
+      "txt": "使后方功法体型巨大化，且在对碰中强度增加{0}%"
     },
     {
       "ID": 1120064,
-      "txt": "后方槽位第一个技能体型巨大化，且在对碰中强度增加{0}%"
+      "txt": "使后方功法体型巨大化，且在对碰中强度增加{0}%"
     },
     {
       "ID": 1120065,
-      "txt": "后方槽位第一个技能体型巨大化，且在对碰中强度增加{0}%\n巨大化的功法对拼耗尽不再消失，而是恢复{1}%强度"
+      "txt": "使后方功法体型巨大化，且在对碰中强度增加{0}%\n巨大化的功法对拼耗尽不再消失，而是恢复{1}%强度"
     },
     {
       "ID": 1120070,
-      "txt": "后槽位技能在催动时获得转盘加速{0}%,持续{1}秒"
+      "txt": "后方功法在催动时使得轮盘运转速度增加{0}%,持续{1}秒"
     },
     {
       "ID": 1120071,
-      "txt": "后槽位技能在催动时获得转盘加速{0}%,持续{1}秒"
+      "txt": "后方功法在催动时使得轮盘运转速度增加{0}%,持续{1}秒"
     },
     {
       "ID": 1120072,
-      "txt": "后槽位技能在催动时获得转盘加速{0}%,持续{1}秒"
+      "txt": "后方功法在催动时使得轮盘运转速度增加{0}%,持续{1}秒"
     },
     {
       "ID": 1120073,
-      "txt": "后槽位技能在催动时获得转盘加速{0}%,持续{1}秒"
+      "txt": "后方功法在催动时使得轮盘运转速度增加{0}%,持续{1}秒"
     },
     {
       "ID": 1120074,
-      "txt": "后槽位技能在催动时获得转盘加速{0}%,持续{1}秒"
+      "txt": "后方功法在催动时使得轮盘运转速度增加{0}%,持续{1}秒"
     },
     {
       "ID": 1120075,
-      "txt": "后槽位技能在催动时获得转盘加速{0}%,持续{1}秒\n加速期间，伤害提升{1}%"
+      "txt": "后方功法在催动时使得轮盘运转速度增加{0}%,持续{1}秒\n轮盘加速期间，伤害提升{1}%"
     },
     {
       "ID": 1120080,
-      "txt": "后方槽位如果是剑功法，在释放功法时额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
+      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
     },
     {
       "ID": 1120081,
-      "txt": "后方槽位如果是剑功法，在释放功法时额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
+      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
     },
     {
       "ID": 1120082,
-      "txt": "后方槽位如果是剑功法，在释放功法时额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
+      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
     },
     {
       "ID": 1120083,
-      "txt": "后方槽位如果是剑功法，在释放功法时额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
+      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
     },
     {
       "ID": 1120084,
-      "txt": "后方槽位如果是剑功法，在释放功法时额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
+      "txt": "后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果"
     },
     {
       "ID": 1120085,
-      "txt": "前方和后方槽位如果是剑功法，在释放功法时额外释放{0}道剑气，对敌人造成{0}%伤害，并无视护盾类效果\n该剑气会对敌人施加{2}层流血"
+      "txt": "前后方功法为剑功法时，催动功法后额外释放{0}道剑气，对敌人造成{1}%伤害，并无视护盾类效果\n该剑气会对敌人施加{2}层流血"
     },
     {
       "ID": 1120090,
-      "txt": "前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时有{1}%概率清除自己1个随机debuff,并恢复{2}%攻击力伤害"
+      "txt": "后方功法每造成一次伤害便会获得一层青莲之气，青莲之气达到{0}层时有{1}%概率清除自身1个负面状态,并恢复{2}%攻击力的血量"
     },
     {
       "ID": 1120091,
-      "txt": "前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%攻击力伤害"
+      "txt": "后方功法每造成一次伤害便会获得一层青莲之气，青莲之气达到{0}层时有{1}%概率清除自身1个负面状态,并恢复{2}%攻击力的血量"
     },
     {
       "ID": 1120092,
-      "txt": "前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%攻击力伤害"
+      "txt": "后方功法每造成一次伤害便会获得一层青莲之气，青莲之气达到{0}层时有{1}%概率清除自身1个负面状态,并恢复{2}%攻击力的血量"
     },
     {
       "ID": 1120093,
-      "txt": "前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%攻击力伤害"
+      "txt": "后方功法每造成一次伤害便会获得一层青莲之气，青莲之气达到{0}层时有{1}%概率清除自身1个负面状态,并恢复{2}%攻击力的血量"
     },
     {
       "ID": 1120094,
-      "txt": "前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%攻击力伤害"
+      "txt": "后方功法每造成一次伤害便会获得一层青莲之气，青莲之气达到{0}层时有{1}%概率清除自身1个负面状态,并恢复{2}%攻击力的血量"
     },
     {
       "ID": 1120095,
-      "txt": "前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%攻击力伤害\n"
+      "txt": "前后方功法每造成一次伤害便会获得一层青莲之气，青莲之气达到{0}层时有{1}%概率清除自身1个负面状态,并恢复{2}%攻击力的血量"
     },
     {
       "ID": 1120100,
-      "txt": "功法在经过木系区域时会触发生机，为角色治疗{0}%最大攻击力伤害"
+      "txt": "功法在经过木属性经脉后触发生机，为自身治疗{0}%攻击力的生命"
     },
     {
       "ID": 1120101,
-      "txt": "功法在经过木系区域时会触发生机，为角色治疗{0}%最大攻击力伤害"
+      "txt": "功法在经过木属性经脉后触发生机，为自身治疗{0}%攻击力的生命"
     },
     {
       "ID": 1120102,
-      "txt": "功法在经过木系区域时会触发生机，为角色治疗{0}%最大攻击力伤害"
+      "txt": "功法在经过木属性经脉后触发生机，为自身治疗{0}%攻击力的生命"
     },
     {
       "ID": 1120103,
-      "txt": "功法在经过木系区域时会触发生机，为角色治疗{0}%最大攻击力伤害"
+      "txt": "功法在经过木属性经脉后触发生机，为自身治疗{0}%攻击力的生命"
     },
     {
       "ID": 1120104,
-      "txt": "功法在经过木系区域时会触发生机，为角色治疗{0}%最大攻击力伤害"
+      "txt": "功法在经过木属性经脉后触发生机，为自身治疗{0}%攻击力的生命"
     },
     {
       "ID": 1120105,
-      "txt": "功法在经过木系区域时会触发生机，为角色治疗{0}%最大攻击力伤害\n在生命值低于{1}%时恢复量提升{2}%"
+      "txt": "功法在经过木属性经脉后触发生机，为自身治疗{0}%攻击力的生命\n在生命值低于{1}%时恢复量提升{2}%"
     },
     {
       "ID": 1120110,
-      "txt": "所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120111,
-      "txt": "所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120112,
-      "txt": "所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120113,
-      "txt": "所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120114,
-      "txt": "所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120115,
-      "txt": "所有流血状态照成的伤害会转换成充能值，2圈后对全体敌人造成{0}%充能值的伤害"
+      "txt": "所有流血状态造成的伤害会转换成充能值，轮盘运转2圈后对全体敌人造成{0}%充能值的伤害"
     },
     {
       "ID": 1120120,
-      "txt": "前方功法对敌人照成伤害时额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层流血"
     },
     {
       "ID": 1120121,
-      "txt": "前方功法对敌人照成伤害时额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层流血"
     },
     {
       "ID": 1120122,
-      "txt": "前方功法对敌人照成伤害时额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层流血"
     },
     {
       "ID": 1120123,
-      "txt": "前方功法对敌人照成伤害时额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层流血"
     },
     {
       "ID": 1120124,
-      "txt": "前方功法对敌人照成伤害时额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层流血"
     },
     {
       "ID": 1120125,
-      "txt": "前方功法对敌人照成伤害时额施加一层流血"
+      "txt": "前方功法对敌人造成伤害后额施加一层流血"
     },
     {
       "ID": 1120130,
@@ -2898,123 +2898,123 @@
     },
     {
       "ID": 1120140,
-      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%伤害的伤害，并对周围的敌人照成该伤害的{2}伤害"
+      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%攻击力的伤害，并对周围的敌人照成该伤害的{2}伤害"
     },
     {
       "ID": 1120141,
-      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%伤害的伤害，并对周围的敌人照成该伤害的{2}伤害"
+      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%攻击力的伤害，并对周围的敌人照成该伤害的{2}伤害"
     },
     {
       "ID": 1120142,
-      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%伤害的伤害，并对周围的敌人照成该伤害的{2}伤害"
+      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%攻击力的伤害，并对周围的敌人照成该伤害的{2}伤害"
     },
     {
       "ID": 1120143,
-      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%伤害的伤害，并对周围的敌人照成该伤害的{2}伤害"
+      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%攻击力的伤害，并对周围的敌人照成该伤害的{2}伤害"
     },
     {
       "ID": 1120144,
-      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%伤害的伤害，并对周围的敌人照成该伤害的{2}伤害"
+      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%攻击力的伤害，并对周围的敌人照成该伤害的{2}伤害"
     },
     {
       "ID": 1120145,
-      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%伤害的伤害，并对周围的敌人照成该伤害的{2}伤害"
+      "txt": "后方功法击中目标后，如果目标升上有{0}层毒时对目标额外照成{1}%攻击力的伤害，并对周围的敌人照成该伤害的{2}伤害"
     },
     {
       "ID": 1120150,
-      "txt": "对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
+      "txt": "后方功法对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
     },
     {
       "ID": 1120151,
-      "txt": "对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
+      "txt": "后方功法对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
     },
     {
       "ID": 1120152,
-      "txt": "对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
+      "txt": "后方功法对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
     },
     {
       "ID": 1120153,
-      "txt": "对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
+      "txt": "后方功法对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
     },
     {
       "ID": 1120154,
-      "txt": "对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
+      "txt": "后方功法对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
     },
     {
       "ID": 1120155,
-      "txt": "对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
+      "txt": "前后方功法对目标造成的异常状态有{0}%概率转移到下一个目标，不会来回转移"
     },
     {
       "ID": 1120160,
-      "txt": "前方功法会让目标扎染上阴水。如果目标身上有寒气则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
     },
     {
       "ID": 1120161,
-      "txt": "前方功法会让目标扎染上阴水。如果目标身上有寒气则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
     },
     {
       "ID": 1120162,
-      "txt": "前方功法会让目标扎染上阴水。如果目标身上有寒气则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
     },
     {
       "ID": 1120163,
-      "txt": "前方功法会让目标扎染上阴水。如果目标身上有寒气则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
     },
     {
       "ID": 1120164,
-      "txt": "前方功法会让目标扎染上阴水。如果目标身上有寒气则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
     },
     {
       "ID": 1120165,
-      "txt": "前方功法会让目标扎染上阴水。如果目标身上有寒气则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
+      "txt": "前方功法会对目标附加阴水。目标身上有寒气时则会将阴水转换为冰冻值(冰冻值到达一定程度会冰冻敌人)"
     },
     {
       "ID": 1120170,
-      "txt": "前方功法附加上灵气汇聚而成的可燃物质，火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质，使火属性伤害提升{0}%并额外施加一层灼烧"
     },
     {
       "ID": 1120171,
-      "txt": "前方功法附加上灵气汇聚而成的可燃物质，火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质，使火属性伤害提升{0}%并额外施加一层灼烧"
     },
     {
       "ID": 1120172,
-      "txt": "前方功法附加上灵气汇聚而成的可燃物质，火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质，使火属性伤害提升{0}%并额外施加一层灼烧"
     },
     {
       "ID": 1120173,
-      "txt": "前方功法附加上灵气汇聚而成的可燃物质，火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质，使火属性伤害提升{0}%并额外施加一层灼烧"
     },
     {
       "ID": 1120174,
-      "txt": "前方功法附加上灵气汇聚而成的可燃物质，火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质，使火属性伤害提升{0}%并额外施加一层灼烧"
     },
     {
       "ID": 1120175,
-      "txt": "前方功法附加上灵气汇聚而成的可燃物质，火属性伤害提升{0}%并额外施加一层灼烧"
+      "txt": "为前方功法附加上灵气汇聚而成的可燃物质，使火属性伤害提升{0}%并额外施加一层灼烧"
     },
     {
       "ID": 1120180,
-      "txt": "每使用一个土系功法时获得{0}点土系值，达到100时获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}点"
+      "txt": "每催动一次土系功法获得{0}层土系值，达到100层后获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}层"
     },
     {
       "ID": 1120181,
-      "txt": "每使用一个土系功法时获得{0}点土系值，达到100时获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}点"
+      "txt": "每催动一次土系功法获得{0}层土系值，达到100层后获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}层"
     },
     {
       "ID": 1120182,
-      "txt": "每使用一个土系功法时获得{0}点土系值，达到100时获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}点"
+      "txt": "每催动一次土系功法获得{0}层土系值，达到100层后获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}层"
     },
     {
       "ID": 1120183,
-      "txt": "每使用一个土系功法时获得{0}点土系值，达到100时获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}点"
+      "txt": "每催动一次土系功法获得{0}层土系值，达到100层后获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}层"
     },
     {
       "ID": 1120184,
-      "txt": "每使用一个土系功法时获得{0}点土系值，达到100时获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}点"
+      "txt": "每催动一次土系功法获得{0}层土系值，达到100层后获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}层"
     },
     {
       "ID": 1120185,
-      "txt": "每使用一个土系功法时获得{0}点土系值，达到100时获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}点"
+      "txt": "每催动一次土系功法获得{0}层土系值，达到100层后获得{1}%防御。持续{2}秒，每对敌人施加一次细尘额外获得{3}层"
     },
     {
       "ID": 1120190,
@@ -3042,27 +3042,27 @@
     },
     {
       "ID": 1131010,
-      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
+      "txt": "对敌人造成{0}伤害，使敌人五行混乱。敌人每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 1131011,
-      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
+      "txt": "对敌人造成{0}伤害，使敌人五行混乱。敌人每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 1131012,
-      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
+      "txt": "对敌人造成{0}伤害，使敌人五行混乱。敌人每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 1131013,
-      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
+      "txt": "对敌人造成{0}伤害，使敌人五行混乱。敌人每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 1131014,
-      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
+      "txt": "对敌人造成{0}伤害，使敌人五行混乱。敌人每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒"
     },
     {
       "ID": 1131015,
-      "txt": "对敌人照成{0}伤害，使敌人五行混乱。敌人的功法每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒\n神农鼎生效期间，使敌人的所有灵根降低{2}%。"
+      "txt": "对敌人造成{0}伤害，使敌人五行混乱。敌人每次使用功法都将使用最低灵根属性作为伤害计算，持续{1}秒\n神龙鼎生效期间，敌人的所有灵根降低{2}%。"
     },
     {
       "ID": 1131020,
@@ -3114,51 +3114,51 @@
     },
     {
       "ID": 1132020,
-      "txt": "用后{2}秒内大幅提升所有灵根{0}%，一场战斗可使用{1}次"
+      "txt": "使用后{2}秒内所有灵根提升{0}%，一场战斗可使用{1}次"
     },
     {
       "ID": 1132021,
-      "txt": "用后{2}秒内大幅提升所有灵根{0}%，一场战斗可使用{1}次"
+      "txt": "使用后{2}秒内所有灵根提升{0}%，一场战斗可使用{1}次"
     },
     {
       "ID": 1132022,
-      "txt": "用后{2}秒内大幅提升所有灵根{0}%，一场战斗可使用{1}次"
+      "txt": "使用后{2}秒内所有灵根提升{0}%，一场战斗可使用{1}次"
     },
     {
       "ID": 1132023,
-      "txt": "用后{2}秒内大幅提升所有灵根{0}%，一场战斗可使用{1}次"
+      "txt": "使用后{2}秒内所有灵根提升{0}%，一场战斗可使用{1}次"
     },
     {
       "ID": 1132024,
-      "txt": "用后{2}秒内大幅提升所有灵根{0}%，一场战斗可使用{1}次"
+      "txt": "使用后{2}秒内所有灵根提升{0}%，一场战斗可使用{1}次"
     },
     {
       "ID": 1132025,
-      "txt": "用后{2}秒内大幅提升所有灵根{0}%，一场战斗可使用{1}次\n混沌珠生效期间，己方所有功法额外增伤{3}%"
+      "txt": "使用后{2}秒内所有灵根提升{0}%，一场战斗可使用{1}次\n混沌珠生效期间，己方所有功法额外增伤{3}%"
     },
     {
       "ID": 1132030,
-      "txt": "对敌人照成{0}%水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
+      "txt": "对敌人照成{0}%水系伤害，封锁敌人随机{1}个经脉使其{2}秒无法流动"
     },
     {
       "ID": 1132031,
-      "txt": "对敌人照成{0}%水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
+      "txt": "对敌人照成{0}%水系伤害，封锁敌人随机{1}个经脉使其{2}秒无法流动"
     },
     {
       "ID": 1132032,
-      "txt": "对敌人照成{0}%水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
+      "txt": "对敌人照成{0}%水系伤害，封锁敌人随机{1}个经脉使其{2}秒无法流动"
     },
     {
       "ID": 1132033,
-      "txt": "对敌人照成{0}%水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
+      "txt": "对敌人照成{0}%水系伤害，封锁敌人随机{1}个经脉使其{2}秒无法流动"
     },
     {
       "ID": 1132034,
-      "txt": "对敌人照成{0}%水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
+      "txt": "对敌人照成{0}%水系伤害，封锁敌人随机{1}个经脉使其{2}秒无法流动"
     },
     {
       "ID": 1132035,
-      "txt": "对敌人照成{0}%水系伤害，封锁敌人筋脉随机{1}个格子流动{2}秒"
+      "txt": "对敌人照成{0}%水系伤害，封锁敌人随机{1}个经脉使其{2}秒无法流动"
     },
     {
       "ID": 1133010,
@@ -3186,51 +3186,51 @@
     },
     {
       "ID": 1133020,
-      "txt": "一盏明灯围绕玩家，{0}秒内抵消所有负面效果，每{1}秒触发1次。"
+      "txt": "祭出一盏明灯围绕周身，在{0}秒内抵消所有负面效果，每{1}秒触发1次。"
     },
     {
       "ID": 1133021,
-      "txt": "一盏明灯围绕玩家，{0}秒内抵消所有负面效果，每{1}秒触发1次。"
+      "txt": "祭出一盏明灯围绕周身，在{0}秒内抵消所有负面效果，每{1}秒触发1次。"
     },
     {
       "ID": 1133022,
-      "txt": "一盏明灯围绕玩家，{0}秒内抵消所有负面效果，每{1}秒触发1次。"
+      "txt": "祭出一盏明灯围绕周身，在{0}秒内抵消所有负面效果，每{1}秒触发1次。"
     },
     {
       "ID": 1133023,
-      "txt": "一盏明灯围绕玩家，{0}秒内抵消所有负面效果，每{1}秒触发1次。"
+      "txt": "祭出一盏明灯围绕周身，在{0}秒内抵消所有负面效果，每{1}秒触发1次。"
     },
     {
       "ID": 1133024,
-      "txt": "一盏明灯围绕玩家，{0}秒内抵消所有负面效果，每{1}秒触发1次。"
+      "txt": "祭出一盏明灯围绕周身，在{0}秒内抵消所有负面效果，每{1}秒触发1次。"
     },
     {
       "ID": 1133025,
-      "txt": "一盏明灯围绕玩家，{0}秒内抵消所有负面效果，每{1}秒触发1次。"
+      "txt": "祭出一盏明灯围绕周身，在{0}秒内抵消所有负面效果，每{1}秒触发1次。"
     },
     {
       "ID": 1134010,
-      "txt": "宝塔在英雄的头顶前往位置旋转，形成一个扇形区域，敌人的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
+      "txt": "祭出宝塔在身前释放扇形的域，敌方的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
     },
     {
       "ID": 1134011,
-      "txt": "宝塔在英雄的头顶前往位置旋转，形成一个扇形区域，敌人的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
+      "txt": "祭出宝塔在身前释放扇形的域，敌方的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
     },
     {
       "ID": 1134012,
-      "txt": "宝塔在英雄的头顶前往位置旋转，形成一个扇形区域，敌人的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
+      "txt": "祭出宝塔在身前释放扇形的域，敌方的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
     },
     {
       "ID": 1134013,
-      "txt": "宝塔在英雄的头顶前往位置旋转，形成一个扇形区域，敌人的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
+      "txt": "祭出宝塔在身前释放扇形的域，敌方的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
     },
     {
       "ID": 1134014,
-      "txt": "宝塔在英雄的头顶前往位置旋转，形成一个扇形区域，敌人的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
+      "txt": "祭出宝塔在身前释放扇形的域，敌方的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒"
     },
     {
       "ID": 1134015,
-      "txt": "宝塔在英雄的头顶前往位置旋转，形成一个扇形区域，敌人的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒\n敌方功法被吸收后，己方英雄临时增加{2}点对应五行灵根，持续{3}秒"
+      "txt": "祭出宝塔在身前释放扇形的域，敌方的功法如果进入这个扇形区域有{0}%概率被法宝吸收，持续{1}秒\n敌方功法被吸收后，将临时增加自身{2}点对应五行灵根，持续{3}秒"
     },
     {
       "ID": 1134020,

Assets/Res/Config/ReddotConfig.json

@@ -3,6 +3,9 @@
     {
       "ID": 1,
       "GroupID": 1,
+      "LinkGroupID": [
+        14
+      ],
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
@@ -99,6 +102,13 @@
       "EnableForTarget": 0,
       "Layer": 1,
       "Enable": 1
+    },
+    {
+      "ID": 14,
+      "GroupID": 14,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
     }
   ]
 }

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -72,8 +72,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -193.1, y: 21}
-  m_SizeDelta: {x: 222, y: 50}
+  m_AnchoredPosition: {x: -182.26573, y: 21}
+  m_SizeDelta: {x: 243.6685, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8974566408459148074
 CanvasRenderer:

Assets/Res/UI/DivineSence/ComBatFrontPanel.prefab

@@ -602,7 +602,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13, y: 21}
+  m_AnchoredPosition: {x: -1, y: 43}
   m_SizeDelta: {x: 295, y: 179}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7772893736343577417
@@ -1406,13 +1406,17 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 87.7
       objectReference: {fileID: 0}
+    - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -132.16257
+      objectReference: {fileID: 0}
     - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 10.8
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -38.5
+      value: -40.08128
       objectReference: {fileID: 0}
     - target: {fileID: 3195684101753423275, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_FontData.m_Alignment
@@ -1448,11 +1452,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9156683410866268513, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 51.2
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 9156683410866268513, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 30.2
+      value: 27
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Res/UI/DivineSence/ComBatFrontWidget.prefab

@@ -595,8 +595,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 75.26347, y: -43.400818}
-  m_SizeDelta: {x: -185.763, y: -131.8486}
+  m_AnchoredPosition: {x: 45.6905, y: -41.66256}
+  m_SizeDelta: {x: -151.381, y: -135.32512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6875849157855808906
 CanvasRenderer:
@@ -628,10 +628,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 4
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -639,7 +639,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7B51\u57FA\u524D\u671F"
+  m_Text: "\u7B51\u57FA\u524D\u671F.\u7B2C\u4E00\u91CD"
 --- !u!114 &4491841701166917159
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -652,7 +652,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  effectColor: {r: 0.10196079, g: 0.17254902, b: 0.07450981, a: 1}
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
   effectDistanceX: 2
   effectDistanceY: 2
   samplingRate: 10
@@ -772,7 +772,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 114.32349, y: 22.523483}
+  m_AnchoredPosition: {x: 69.2, y: 22.523483}
   m_SizeDelta: {x: 42.1514, y: 42.1514}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &2055311934404833937

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -1304,7 +1304,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7059812866358173867}
+  m_Father: {fileID: 8864025907727301406}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2417,12 +2417,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7059812866358173867}
+  m_Father: {fileID: 8864025907727301406}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0.07791138}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3522588436894383635
 CanvasRenderer:
@@ -3497,6 +3497,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6574649598714536494, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6730899750744253868, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_IsActive
       value: 1
@@ -3597,11 +3601,11 @@ PrefabInstance:
     - {fileID: 102496722109560873, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 3764721290890148754, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
-      insertIndex: 0
-      addedObject: {fileID: 826528113821736969}
-    - targetCorrespondingSourceObject: {fileID: 3764721290890148754, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+    - targetCorrespondingSourceObject: {fileID: 3370061335406075943, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       insertIndex: 1
+      addedObject: {fileID: 826528113821736969}
+    - targetCorrespondingSourceObject: {fileID: 3370061335406075943, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      insertIndex: 2
       addedObject: {fileID: 891011900833867173}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
@@ -3610,11 +3614,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 5808298135736668641, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
   m_PrefabInstance: {fileID: 6181054649854434105}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &7059812866358173867 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3764721290890148754, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
-  m_PrefabInstance: {fileID: 6181054649854434105}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8864025907727301406 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3370061335406075943, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -32,7 +32,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -143,7 +143,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -224,7 +224,7 @@ RectTransform:
   m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
   m_ConstrainProportionsScale: 1
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -313,7 +313,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1357364587688641971}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -460,7 +460,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -594,7 +594,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9098093879968300551}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -686,7 +686,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 595589076442330505}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -910,23 +910,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8807649875490934103}
-  - {fileID: 1357522047238736597}
-  - {fileID: 5225875953063125181}
-  - {fileID: 3650536308811846443}
-  - {fileID: 7566769296908980725}
-  - {fileID: 712579681456886399}
-  - {fileID: 2781605243884814213}
-  - {fileID: 6760469126628422357}
-  - {fileID: 3042280114302172752}
-  - {fileID: 145896444123704845}
-  - {fileID: 7551747957602520090}
-  - {fileID: 7325153162450915011}
-  - {fileID: 8173313993394265504}
-  - {fileID: 6639653483637829207}
-  - {fileID: 1007467258602941415}
-  - {fileID: 2080350128756554473}
+  m_Children: []
   m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -973,7 +957,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1062,7 +1046,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -1151,7 +1135,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1231,7 +1215,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1321,6 +1305,10 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3764721290890148754}
+  - {fileID: 8807649875490934103}
+  - {fileID: 1357522047238736597}
+  - {fileID: 4942424813403464864}
+  - {fileID: 1073463540969944153}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1416,6 +1404,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Root
+    gameObject: {fileID: 6574649598714536494}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Tips
+    gameObject: {fileID: 4118340536173480420}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &6756300365015287303
 MonoBehaviour:
@@ -1434,7 +1432,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5895335, y: 0.6792451, z: 0.63400584, w: 1}
+      - {x: 0.712264, y: 0.712264, z: 0.712264, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1465,7 +1463,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.601415, y: 0.72345334, z: 0.8018867, w: 1}
+      - {x: 0.5882353, y: 0.6784314, z: 0.63529414, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1496,7 +1494,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7411765, y: 0.5921569, z: 0.8431373, w: 1}
+      - {x: 0.6, y: 0.72156864, z: 0.8, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1527,7 +1525,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.8726414, y: 0.7377412, z: 0.44866928, w: 1}
+      - {x: 0.7411765, y: 0.5921569, z: 0.84313726, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1657,7 +1655,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -1941,6 +1939,65 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u652F\u7EBF"
+--- !u!1 &6574649598714536494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4942424813403464864}
+  - component: {fileID: 3941386581674135772}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4942424813403464864
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6574649598714536494}
+  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:
+  - {fileID: 5225875953063125181}
+  - {fileID: 3650536308811846443}
+  - {fileID: 7566769296908980725}
+  - {fileID: 712579681456886399}
+  - {fileID: 2781605243884814213}
+  - {fileID: 6760469126628422357}
+  - {fileID: 3042280114302172752}
+  - {fileID: 145896444123704845}
+  - {fileID: 7551747957602520090}
+  - {fileID: 7325153162450915011}
+  - {fileID: 8173313993394265504}
+  - {fileID: 6639653483637829207}
+  - {fileID: 1007467258602941415}
+  - {fileID: 2080350128756554473}
+  m_Father: {fileID: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3941386581674135772
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6574649598714536494}
+  m_CullTransparentMesh: 1
 --- !u!1 &6730899750744253868
 GameObject:
   m_ObjectHideFlags: 0
@@ -1972,7 +2029,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 3370061335406075943}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -2000,7 +2057,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5895335, g: 0.6792451, b: 0.63400584, a: 1}
+  m_Color: {r: 0.712264, g: 0.712264, b: 0.712264, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2258,6 +2315,86 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10159
+--- !u!1 &8060125887827060197
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1073463540969944153}
+  - component: {fileID: 1997598539031156822}
+  - component: {fileID: 4118340536173480420}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Tips
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1073463540969944153
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8060125887827060197}
+  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: 3370061335406075943}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.0000052452087, y: 0}
+  m_SizeDelta: {x: 564.0696, y: 29.6509}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1997598539031156822
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8060125887827060197}
+  m_CullTransparentMesh: 1
+--- !u!114 &4118340536173480420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8060125887827060197}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.34509805, g: 0.3137255, b: 0.3019608, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u900D\u9065\u6E38\u5DF2\u5B8C\u6210\uFF0C\u656C\u8BF7\u671F\u5F85\u540E\u7EED\u5185\u5BB9"
 --- !u!1 &8193172811373753691
 GameObject:
   m_ObjectHideFlags: 0
@@ -2284,13 +2421,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8193172811373753691}
-  m_LocalRotation: {x: 0, y: 0, z: -0.20791169, w: 0.9781476}
+  m_LocalRotation: {x: -0, y: -0, z: -0.20791169, w: 0.9781476}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1132527634272378842}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2381,7 +2518,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1926551284965162357}
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -2475,7 +2612,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3764721290890148754}
+  m_Father: {fileID: 4942424813403464864}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

Assets/Res/UI/HeroInformainPanel/Animator.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bykf53ykACgPt2WHdAqy57fo4oN7gJO6l+HdbnRSrjkvHJbZMLASnSo26qWD
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/HeroAttributeWidget.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 127.7, y: 3.5639}
-  m_SizeDelta: {x: 111.28, y: 45.596}
+  m_SizeDelta: {x: 133.8, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &192917626739261170
 CanvasRenderer:
@@ -79,7 +79,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 2370
+  m_Text: "2370.1\u4E07"
 --- !u!1 &2731470648553323167
 GameObject:
   m_ObjectHideFlags: 0
@@ -115,8 +115,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 419, y: -0.33512}
-  m_SizeDelta: {x: 81.3883, y: 37.798}
+  m_AnchoredPosition: {x: 406.4, y: -0.33512}
+  m_SizeDelta: {x: 143.7659, y: 37.798}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6075765814148249060
 CanvasRenderer:
@@ -159,7 +159,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: +90
+  m_Text: "+9010.1\u4E07"
 --- !u!1 &2963361265419753275
 GameObject:
   m_ObjectHideFlags: 0
@@ -413,7 +413,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 19, y: 1.6}
+  m_AnchoredPosition: {x: 67.4, y: 1.6}
   m_SizeDelta: {x: 28, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6381163825326017891

Assets/Res/UI/HeroInformainPanel/HeroAttributeWidgetType2.prefab

@@ -164,7 +164,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 184.3, y: 4.1302}
-  m_SizeDelta: {x: 77.3688, y: 45.596}
+  m_SizeDelta: {x: 150.2247, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3639138606694352301
 CanvasRenderer:
@@ -207,7 +207,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: +794
+  m_Text: "+7941.1\u4E07"
 --- !u!1 &4252063621790870621
 GameObject:
   m_ObjectHideFlags: 0
@@ -244,7 +244,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 377.5, y: 4.1302}
-  m_SizeDelta: {x: 77.3688, y: 45.596}
+  m_SizeDelta: {x: 155.7138, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1780294559565883098
 CanvasRenderer:
@@ -287,7 +287,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: +794
+  m_Text: "+7944.1\u4E07"
 --- !u!1 &9028940008435226479
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -5747,6 +5747,21 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_tupo2
+    gameObject: {fileID: 1351546473485693172}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
   isAssetBundle: 1
 --- !u!1001 &508761963476317887
 PrefabInstance:
@@ -6527,15 +6542,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
       propertyPath: m_LocalPosition.x
@@ -6614,6 +6629,11 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
+--- !u!1 &1351546473485693172 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 429141462419320987, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}
+  m_PrefabInstance: {fileID: 1672301908283277423}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1793514868338276612 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1141361224366291307, guid: 05fc66bf8454a1c4684b50156701a448, type: 3}

Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab

@@ -289,8 +289,7 @@ RectTransform:
   - {fileID: 543116040436373444}
   - {fileID: 2583264031236995806}
   - {fileID: 4092484107647895613}
-  - {fileID: 472811775746804830}
-  - {fileID: 1085220640693048462}
+  - {fileID: 8266832900577066409}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -361,6 +360,93 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!1 &5170332322964461372
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7129149656182869682}
+  - component: {fileID: 7335451067053430739}
+  - component: {fileID: 8257280305357096206}
+  - component: {fileID: 5828648931728266450}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: AttributeRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7129149656182869682
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  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: 8266832900577066409}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -5.1293, y: 327.2}
+  m_SizeDelta: {x: 578.0841, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &7335451067053430739
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  m_CullTransparentMesh: 1
+--- !u!114 &8257280305357096206
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 5.34
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &5828648931728266450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5170332322964461372}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &5294230650080845847
 GameObject:
   m_ObjectHideFlags: 0
@@ -672,116 +758,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &6328008475876290341
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 472811775746804830}
-  - component: {fileID: 5249337868127242115}
-  - component: {fileID: 8021534401990309569}
-  - component: {fileID: 7766564801190356076}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &472811775746804830
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  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: 3479442316472032070}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 2}
-  m_Pivot: {x: 0.5, y: 1}
---- !u!222 &5249337868127242115
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  m_CullTransparentMesh: 1
---- !u!114 &8021534401990309569
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.4666667, g: 0.36078432, b: 0.24705884, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_TupoFenGeXian
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
-  packInfo:
-    packName: jingjie
-    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
-    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
-  imageH: 2
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!114 &7766564801190356076
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6328008475876290341}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &7371325538380333896
 GameObject:
   m_ObjectHideFlags: 0
@@ -883,7 +859,7 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
---- !u!1 &8761311858942247224
+--- !u!1 &8252014874114865912
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -891,59 +867,59 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1085220640693048462}
-  - component: {fileID: 956848905564691411}
-  - component: {fileID: 8921433333291855242}
-  - component: {fileID: 4479323012423221125}
+  - component: {fileID: 8266832900577066409}
+  - component: {fileID: 7127467652639367246}
+  - component: {fileID: 1165132109175964643}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: AttributeBg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &1085220640693048462
+  m_IsActive: 1
+--- !u!224 &8266832900577066409
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
+  m_GameObject: {fileID: 8252014874114865912}
   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_Children:
+  - {fileID: 7129149656182869682}
   m_Father: {fileID: 3479442316472032070}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 2}
-  m_Pivot: {x: 0.5, y: 0}
---- !u!222 &956848905564691411
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 6.029785, y: -210.1}
+  m_SizeDelta: {x: 592.3805, y: 346.9185}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7127467652639367246
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
+  m_GameObject: {fileID: 8252014874114865912}
   m_CullTransparentMesh: 1
---- !u!114 &8921433333291855242
+--- !u!114 &1165132109175964643
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
+  m_GameObject: {fileID: 8252014874114865912}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.4666667, g: 0.36078432, b: 0.24705884, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -951,7 +927,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -960,7 +936,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_TupoFenGeXian
+  _icon_name: dec_dikuang_db
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
@@ -968,31 +944,11 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
-  imageH: 2
+  imageH: 346
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!114 &4479323012423221125
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8761311858942247224}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -1024,8 +980,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8212670971040085124}
   - {fileID: 1871334959253546311}
+  - {fileID: 8212670971040085124}
   - {fileID: 3479442316472032070}
   - {fileID: 4363201749955246993}
   - {fileID: 8489357731499039436}
@@ -1075,6 +1031,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: AttributeRoot
+    gameObject: {fileID: 7129149656182869682}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!95 &4895211963443726447
 Animator:
@@ -1109,14 +1070,26 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 756648002295189263, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1646731325258546683, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1646731325258546683, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1819034189074160187, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1819034189074160187, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3605989120534549272, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -1221,6 +1194,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3975577161060829257, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5928305546705379711, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Particles.Array.size
       value: 8
@@ -1245,6 +1222,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6416273557571709796, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7238359920612202419, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: randomSeed
       value: 3639
@@ -1261,14 +1242,26 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8646301895823271843, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8676008609181533993, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8676008609181533993, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8765597809117012698, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8765597809117012698, guid: ae85a6b757299204aade81808ad4abc6, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/MainHeroPanel/FaBaoSkillWidget.prefab

@@ -443,8 +443,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 31.3, y: -1.7}
-  m_SizeDelta: {x: 227.8363, y: 61.48}
+  m_AnchoredPosition: {x: 114.68706, y: -1.7}
+  m_SizeDelta: {x: 394.6104, y: 61.48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1155897890668048683
 CanvasRenderer:

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8010219124151300276
 RectTransform:
   m_ObjectHideFlags: 0
@@ -201,12 +201,12 @@ RectTransform:
   - {fileID: 7242877048583604540}
   - {fileID: 8048570897024190138}
   - {fileID: 2175225039670005603}
-  m_Father: {fileID: 86604009502899239}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -116.2, y: -12.5}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 52.299988, y: 384}
+  m_SizeDelta: {x: 89, y: 89}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3771783693810167237
 CanvasRenderer:
@@ -223,7 +223,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 454805197462043420}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -246,7 +246,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_fengling
+  _icon_name: dec_lingdang_db
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
@@ -351,7 +351,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.3, y: 44.2733}
+  m_AnchoredPosition: {x: 4.6, y: 37.7}
   m_SizeDelta: {x: 203.3, y: 37.2295}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4807162858721399125
@@ -521,8 +521,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.921}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -7.299959, y: -51.500004}
-  m_SizeDelta: {x: 51, y: 68}
+  m_AnchoredPosition: {x: 0.0000121593475, y: 0}
+  m_SizeDelta: {x: 56.3365, y: 75.1154}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &778206244950053257
 CanvasRenderer:
@@ -1125,7 +1125,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 332}
+  m_AnchoredPosition: {x: 84.8, y: 322.1}
   m_SizeDelta: {x: 337, y: 129}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &76856068010717943
@@ -1233,7 +1233,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 0.3
   isUpdate: 0
-  currTime: 0.3020946
+  currTime: 0.3024325
   GrpupInfos:
   - Foldout: 1
     isActive: 1
@@ -2641,7 +2641,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3.2, y: 46.6}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3840097278478969659
@@ -3644,13 +3644,12 @@ RectTransform:
   - {fileID: 7440752129834858667}
   - {fileID: 8258499293957039645}
   - {fileID: 8728580503868501898}
-  - {fileID: 1194356122697894574}
   m_Father: {fileID: 2950467415780753011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 337, y: 129}
+  m_SizeDelta: {x: 306, y: 118}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6917675478362225246
 CanvasRenderer:
@@ -3673,7 +3672,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3690,14 +3689,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_renw_db3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 61bb4fbc9f673f9cd44c50cdfa76de0d
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -4201,7 +4200,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2394298463810824802
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4219,7 +4218,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 330, y: 130}
+  m_SizeDelta: {x: 306, y: 118}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5012491853445144891
 CanvasRenderer:
@@ -4259,7 +4258,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_renw_db2
+  _icon_name: dec_renw_db3
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
   packInfo:
@@ -4307,7 +4306,7 @@ RectTransform:
   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: -18.149994, y: -11.5}
+  m_AnchoredPosition: {x: -10.5, y: -2.8}
   m_SizeDelta: {x: 22, y: 20}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1035588383843407233
@@ -4397,8 +4396,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 39.7, y: -30.400002}
-  m_SizeDelta: {x: 40, y: 40}
+  m_AnchoredPosition: {x: 24.3, y: -22.4}
+  m_SizeDelta: {x: 27.2028, y: 27.2028}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8077971288880520705
 CanvasRenderer:
@@ -4521,10 +4520,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2175225039670005603}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 32, y: 32}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000011444092, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &443331176857040011
 CanvasRenderer:
@@ -4567,7 +4566,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 10
+  m_Text: 2
 --- !u!1 &8228207129280405871
 GameObject:
   m_ObjectHideFlags: 0
@@ -4603,7 +4602,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 44.6, y: -11.5}
+  m_AnchoredPosition: {x: 6.9, y: -21.3}
   m_SizeDelta: {x: 211.5, y: 37.2295}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1696963883813292846
@@ -5339,6 +5338,7 @@ RectTransform:
   - {fileID: 1188243619286222832}
   - {fileID: 1798015912972164048}
   - {fileID: 6224376037976265680}
+  - {fileID: 1194356122697894574}
   - {fileID: 3695676087259227986}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3010089067676543759
 RectTransform:
   m_ObjectHideFlags: 0
@@ -32,11 +32,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children: []
-  m_Father: {fileID: 6618987967785114178}
+  m_Father: {fileID: 6527561963321663096}
   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: -15.3, y: 0.000024319}
+  m_AnchoredPosition: {x: -90.5258, y: 0.000024319}
   m_SizeDelta: {x: 17.3661, y: 20.8393}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5365322635743840051
@@ -145,6 +145,7 @@ GameObject:
   - component: {fileID: 6554596081216309278}
   - component: {fileID: 4830072340555722385}
   - component: {fileID: 6440966455622951679}
+  - component: {fileID: 7038271838070358200}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -165,12 +166,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6618987967785114178}
+  m_Father: {fileID: 6527561963321663096}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 2.659, y: 0}
-  m_SizeDelta: {x: 79.382, y: 44.694}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 118.5112, y: -26}
+  m_SizeDelta: {x: 126, y: 44.694}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4830072340555722385
 CanvasRenderer:
@@ -213,7 +214,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 4200
+  m_Text: "4200.11\u4E07"
+--- !u!114 &7038271838070358200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2235163630326853260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &2245206468840536257
 GameObject:
   m_ObjectHideFlags: 0
@@ -225,6 +240,9 @@ GameObject:
   - component: {fileID: 6527561963321663096}
   - component: {fileID: 5554054428056264509}
   - component: {fileID: 5160942985902929946}
+  - component: {fileID: 3088531684017576007}
+  - component: {fileID: 8108464645248095485}
+  - component: {fileID: 8736962646787040581}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: EnergyWidget
@@ -245,13 +263,15 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
-  - {fileID: 6618987967785114178}
+  - {fileID: 8519055793353954361}
+  - {fileID: 6554596081216309278}
+  - {fileID: 3010089067676543759}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 33.836975, y: 12.322754}
-  m_SizeDelta: {x: 150, y: 52}
+  m_SizeDelta: {x: 0, y: 52}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5554054428056264509
 CanvasRenderer:
@@ -285,11 +305,95 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: Btn_Coin
-    gameObject: {fileID: 5991244219049863566}
+    gameObject: {fileID: 8736962646787040581}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &3088531684017576007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2245206468840536257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &8108464645248095485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2245206468840536257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &8736962646787040581
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2245206468840536257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &4311744359091135946
 GameObject:
   m_ObjectHideFlags: 0
@@ -323,11 +427,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6618987967785114178}
+  m_Father: {fileID: 6527561963321663096}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -65.2, y: 1.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 55.5112, y: 55.5112}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4099161695515857595
@@ -441,140 +545,3 @@ MonoBehaviour:
   ease: 5
   animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
   isEnabled: 1
---- !u!1 &9208053142604902796
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6618987967785114178}
-  - component: {fileID: 5984184458604740083}
-  - component: {fileID: 5991244219049863566}
-  - component: {fileID: 7036042581768901039}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Coin
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &6618987967785114178
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  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:
-  - {fileID: 8519055793353954361}
-  - {fileID: 6554596081216309278}
-  - {fileID: 3010089067676543759}
-  m_Father: {fileID: 6527561963321663096}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 31.9, y: 0}
-  m_SizeDelta: {x: 147.9615, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &5984184458604740083
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  m_CullTransparentMesh: 1
---- !u!114 &5991244219049863566
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 7036042581768901039}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
---- !u!114 &7036042581768901039
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9208053142604902796}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.1137255, g: 0.10980393, b: 0.10588236, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_xiulianTiaoDi
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
-  packInfo:
-    packName: jingjie
-    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
-    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
-  imageH: 50
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -1443,6 +1443,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7820611370538219087}
+  - {fileID: 7203466323980298071}
   m_Father: {fileID: 6870355629153732168}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -2086,7 +2087,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8355865228313168032
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2219,7 +2220,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3727605509090450065
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2236,8 +2237,8 @@ RectTransform:
   - {fileID: 5985873034990668332}
   - {fileID: 4047916813180227560}
   - {fileID: 111880961769183880}
-  - {fileID: 8355865228313168032}
   - {fileID: 1450357347166671142}
+  - {fileID: 8355865228313168032}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -7739,6 +7740,116 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1357477070563130315, guid: b01f0c020781e274baa8e3685f237a9a, type: 3}
   m_PrefabInstance: {fileID: 4131293543597701602}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4794029153667740339
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4487645842108660236}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -6.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Name
+      value: RedDotCom
+      objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 14
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+--- !u!224 &7203466323980298071 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+  m_PrefabInstance: {fileID: 4794029153667740339}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7547607250917142542
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Res/UI/TowerPanel/TowerLevelWidget.prefab

@@ -398,14 +398,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_BubbleFrame01_Hexagon_Bg_Blue
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: ee9f4291814fb15d06fb06b5d297fabf
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
   imageH: 135.7429
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Res/UIAtlas/mainUI.spriteatlasv2

@@ -25,6 +25,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: a12eb982dbdc0894586e7d39acac50e7, type: 3}
     - {fileID: 2800000, guid: 12d636aca73b99b4bb5e826f060d4b23, type: 3}
     - {fileID: 2800000, guid: 5473c79ffd6b84e4c9de2b607f6fbb01, type: 3}
+    - {fileID: 2800000, guid: 2bcb5569814ba904d98e9913f9cce4ee, type: 3}
     - {fileID: 2800000, guid: caf59be6b62f1ff40b2937ade714bf4d, type: 3}
     - {fileID: 2800000, guid: 7d4a7a803f84e1845966b3d57df9ebd1, type: 3}
     - {fileID: 2800000, guid: 94a1e98605bef084cac2665d137cd336, type: 3}
@@ -35,6 +36,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 57e52cb3eeb03a942a554f60db0db782, type: 3}
     - {fileID: 2800000, guid: e331aa9696aa95442afd1c99be6ebdf1, type: 3}
     - {fileID: 2800000, guid: 35e03d0aa90e64240913ca8c32f3e877, type: 3}
+    - {fileID: 2800000, guid: 7be5f660c36d392419b2828ca276042e, type: 3}
     - {fileID: 2800000, guid: f82d1b4984be31a4bbcd212e7d42374e, type: 3}
     - {fileID: 2800000, guid: 1db9d86baf4548f449f6aec203999ca0, type: 3}
     - {fileID: 2800000, guid: bfcfc5758571af94a87e12b34550e4d4, type: 3}

Assets/Scripts/Core/UI/UTool/UtilTools.cs

@@ -565,60 +565,59 @@ namespace Utility
 
         public static string ToStringEx(this long number)
         {
-            // if (number > 1000000000000)
-            // {
-            //     float n = number / 1000000000000f;
-            //     string str = "";
-            //     str = GetTargetDecimalPlaceStr((int)n);
-            //     return str + "t";
-            // }
-            //
-            // if (number > 1000000000)
-            // {
-            //     float n = number / 1000000000f;
-            //     string str = "";
-            //     str = GetTargetDecimalPlaceStr((int)n);
-            //     return str + "b";
-            // }
-
-            if (number > 10000)
+            if (number < 10000)
+            {
+                // 小于1万，直接返回整数
+                return ((long)number).ToString();
+            }
+            else if (number < 100000000)
             {
-                float n = number / 10000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "万";
+                // 1万到1亿之间，使用万单位
+                float valueInWan = number / 10000f;
+                return FormatWithTwoDecimalPlaces(valueInWan) + "万";
             }
+            else
+            {
+                // 大于等于1亿，使用亿单位
+                float valueInYi = number / 100000000f;
+                return FormatWithTwoDecimalPlaces(valueInYi) + "亿";
+            }
+        }
 
-            if (number > 1000)
+        private static string FormatWithTwoDecimalPlaces(float value)
+        {
+            // 四舍五入到2位小数
+            double rounded = Math.Round(value, 2);
+
+            // 如果小数部分为0，只返回整数部分
+            if (rounded == Math.Floor(rounded))
             {
-                float n = number / 1000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "千";
+                return ((long)rounded).ToString();
             }
 
-            return number.ToString();
+            // 返回最多2位小数
+            return rounded.ToString("0.##");
         }
 
         public static string ToStringEx(this int number)
         {
-            if (number > 1000000)
+            if (number < 10000)
             {
-                float n = number / 10000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "万";
+                // 小于1万，直接返回整数
+                return ((long)number).ToString();
             }
-
-            if (number > 100000)
+            else if (number < 100000000)
             {
-                float n = number / 1000f;
-                string str = "";
-                str = GetTargetDecimalPlaceStr((int)n);
-                return str + "千";
+                // 1万到1亿之间，使用万单位
+                float valueInWan = number / 10000f;
+                return FormatWithTwoDecimalPlaces(valueInWan) + "万";
+            }
+            else
+            {
+                // 大于等于1亿，使用亿单位
+                float valueInYi = number / 100000000f;
+                return FormatWithTwoDecimalPlaces(valueInYi) + "亿";
             }
-
-            return number.ToString();
         }
 #endif
         /// <summary>

Assets/Scripts/GameData/ExcelConfig/TowerInfoConfig.cs

@@ -94,6 +94,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] rewardCount;
+#else
+		public int[] rewardCount{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///解锁值
 		/// </summary>

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -47,12 +47,14 @@ namespace Fort23.Mono
                 //上阵的功法可以升级显示红点
                 case 1:
                     isEnable = false;
-                    switch (EnableId) 
+                    switch (EnableId)
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
                             break;
                         case 1:
+
+
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allSkill)
                             {
                                 if (RedDotManager.Instance.isSkillStar(_skillInfo))
@@ -62,7 +64,7 @@ namespace Fort23.Mono
                                 }
                             }
 
-                         
+
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allUseSkill)
                             {
                                 if (RedDotManager.Instance.isSkillUpgradeDaYu4(_skillInfo))
@@ -75,11 +77,41 @@ namespace Fort23.Mono
                             break;
                     }
 
+                    break;
+
+                case 14:
+                    isEnable = false;
+                    switch (EnableId)
+                    {
+                        case 0: //没有自己的红点逻辑根据下层红点来决定
+                            isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
+                            break;
+                        case 1:
+
+                            int count = 0;
+                            for (var i = 0; i < PlayerManager.Instance.GongFaControl.allUseSkill.Length; i++)
+                            {
+                                if (PlayerManager.Instance.GongFaControl.allUseSkill[i] != null &&
+                                    PlayerManager.Instance.GongFaControl.allUseSkill[i].skillConfig.SkillType == 1)
+                                {
+                                    count++;
+                                }
+                            }
+
+                            if (count < PlayerManager.Instance.myHero.powerUpConfig.MaxActiveGongfaNum)
+                            {
+                                isEnable = true;
+                            }
+
+
+                            break;
+                    }
+
                     break;
                 //境界升级
-                case 5: 
+                case 5:
                     isEnable = false;
-                    switch (EnableId) 
+                    switch (EnableId)
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
                             isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -197,8 +197,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
             else if (AccountFileInfo.Instance.playerData.eventList.Count > 0)
             {
-                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId =
-                    AccountFileInfo.Instance.playerData.eventList[0].guid;
+                AccountFileInfo.EventList eventList1 =
+                    AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e =>
+                        !e.isCompleted && !e.isCompleted1);
+                if (eventList1 != null)
+                    AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId = eventList1.guid;
             }
         }
     }
@@ -482,6 +485,15 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 continue;
             }
 
+            if (itemInfoType1 != null)
+            {
+                PlayerManager.Instance.BagController.DeductItem(itemInfoType1.itemID, 1);
+            }
+
+            if (itemInfoType2 != null)
+            {
+                PlayerManager.Instance.BagController.DeductItem(itemInfoType2.itemID, 1);
+            }
 
             int randomValue1 = Random.Range(0, 101);
             // 达到怪率刷新场景特定事件
@@ -691,7 +703,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         LanguageManager.Instance.Text(10379,
-                            LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName),
                             lastSmallPlacesConfig.CompletionEventCount - lastSmallPlacesData?.completionEventCount));
                     if (PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
@@ -1071,6 +1082,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     return PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i];
                 //境界判断
                 case 3:
@@ -1078,6 +1090,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     return PlayerManager.Instance.myHero.level >= evt.EventValue[i];
                 //概率判断
                 case 7:
@@ -1085,6 +1098,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     int randomValue1 = Random.Range(0, 1001);
 
                     return randomValue1 <= evt.EventValue[i];
@@ -1094,6 +1108,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         return false;
                     }
+
                     AccountFileInfo.EventList eventList =
                         AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
                             ce.eventID == evt.EventValue[i]);
@@ -1309,7 +1324,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }
-        
+
 
         if (eventConfig.ID == 10001 && PlayerGuideManager.Instance.GuideIsCanDo(2))
         {

Assets/Scripts/GameUI/UI/AppBarPanel/TitlePanel.cs

@@ -80,6 +80,7 @@ namespace Fort23.Mono
 
 
             int bl = (int)((heroAllexp / allexp) * 100);
+            bl = bl > 100 ? 100 : bl;
 
             Text_JingJie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -165,7 +165,7 @@ namespace Fort23.Mono
                     allKongSkill[i].InitWidget(allKongSkill[i].index, this);
                 }
 
-                for (var i = 0; i < indexList.Count; i++)
+                for (var i = 0; i < indexList.Count - 1; i++)
                 {
                     if (skills[i] == null)
                         continue;
@@ -181,7 +181,10 @@ namespace Fort23.Mono
                 isAlter = true;
 
                 UpdateSkillWidget();
+                ChangeFuZhuYingXiang();
                 BaoChun();
+
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
             });
 
             Btn_ChangeOk.onClick.AddListener(() =>
@@ -384,6 +387,7 @@ namespace Fort23.Mono
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
                 AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
             });
 
             Sv.onValueChanged.AddListener((s) =>
@@ -845,7 +849,7 @@ namespace Fort23.Mono
                 CloseSelect();
                 BaoChun();
 
-
+                RedDotManager.Instance.TarGetRedDotUpDate(14);
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
             }
@@ -1176,6 +1180,7 @@ namespace Fort23.Mono
             }
         }
 
+
         List<int> yingxiang = new List<int>();
 
         private void CloseSelect()

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -131,16 +131,21 @@ namespace Fort23.Mono
                 // Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
                 Text_Tips.gameObject.SetActive(false);
                 AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+                if (mainShengShiEventWidgetType2 == null)
+                    mainShengShiEventWidgetType2 =
+                        await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidgetType2>(
+                            ShengShiEventWidgetType2Game, null, ShengShiEventWidgetType2Root);
                 if (eventList != null)
                 {
-                    if (mainShengShiEventWidgetType2 == null)
-                        mainShengShiEventWidgetType2 =
-                            await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidgetType2>(
-                                ShengShiEventWidgetType2Game, null, ShengShiEventWidgetType2Root);
                     mainShengShiEventWidgetType2.own.SetActive(true);
                     mainShengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
                     mainShengShiEventWidgetType2.OnClick = OnClick;
                 }
+                else
+                {
+                    mainShengShiEventWidgetType2.own.SetActive(true);
+                    mainShengShiEventWidgetType2.CustomInit1();
+                }
             }
             //道友
             else

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoBtnWidget.cs

@@ -43,6 +43,7 @@ namespace Fort23.Mono
                     ItemInfo = null;
                     Icon_ItemIcon.gameObject.SetActive(false);
                     Icon_ShenIcon.gameObject.SetActive(false);
+                    Icon_ItemIcon2.gameObject.SetActive(false);
                     Text_ItemCount.text = "";
                     icon_Jia.gameObject.SetActive(true);
                 }

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -75,6 +75,8 @@ namespace Fort23.Mono
 
         public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
         {
+            Text_Tips.gameObject.SetActive(false);
+            Root.gameObject.SetActive(true);
             foreach (var widgetItem in widgetList)
             {
                 UIManager.Instance.DormancyGComponent(widgetItem);
@@ -265,6 +267,11 @@ namespace Fort23.Mono
             }
         }
 
+        public async void CustomInit1()
+        {
+            Text_Tips.gameObject.SetActive(true);
+Root.gameObject.SetActive(false);
+        }
 
         public override void DormancyObj()
         {

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2Data.cs

@@ -173,6 +173,28 @@ namespace Fort23.Mono
 	      return _csc;
 	     }
 	   }
+	  private GameObject _Root;
+	  public GameObject Root
+	   {
+	   get{
+	      if (_Root == null)
+	       {
+	         _Root  = GetUIUnit<GameObject>("Root"); 
+	       }
+	      return _Root;
+	     }
+	   }
+	  private Text _Text_Tips;
+	  public Text Text_Tips
+	   {
+	   get{
+	      if (_Text_Tips == null)
+	       {
+	         _Text_Tips  = GetUIUnit<Text>("Text_Tips"); 
+	       }
+	      return _Text_Tips;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase1.cs

@@ -113,10 +113,15 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep103(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            
+            PlayerGuideManager.Instance.SetOnClickMask(true);
+            await TimerComponent.Instance.WaitAsync(100);
+          
+            
             GameObject gameObject = UIManager.Instance.GetComponent<MainPanel>().Btn_StartEvent.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs

@@ -86,6 +86,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep401(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
+            await TimerComponent.Instance.WaitAsync(100);
+       
             GameObject gameObject = UIManager.Instance.GetComponent<AppBarPanel>().Btn_GongFa.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
@@ -94,7 +97,7 @@ namespace Fort23.Mono.Phases
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             await pgm.ConfigLogic(401, delegate() { });
 
             pgm.SetFingerPos(localPos);

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase7.cs

@@ -30,7 +30,7 @@ namespace Fort23.Mono.Phases
             actionList.Add(OnStep703);
             actionList.Add(OnStep704);
             actionList.Add(OnStep705);
-            actionList.Add(OnStep706);
+            // actionList.Add(OnStep706);
             actionList.Add(OnStepEnd);
         }
 
@@ -181,21 +181,8 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep705(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            await TimerComponent.Instance.WaitAsync(100);
-
-            GameObject gameObject =
-                (UIManager.Instance.GetComponent<ShopPanel>()._shopGroupWidgetType1s[0] as ShopGroupWidgetType1)
-                ._shopItemWidgetType2s[4].own;
-            Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
-            Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
-
-            pgm.SetfxTransVisiable(true);
-            pgm.SetMaskTarget(gameObject);
-            pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
-            await pgm.ConfigLogic(705, delegate() { });
 
-            pgm.SetFingerPos(localPos);
-            pgm.SetFingerVisiable(true);
+            await pgm.ConfigLogic(705, delegate() { pgm.NextGuide(); });
         }
 
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidget.cs

@@ -16,8 +16,9 @@ namespace Fort23.Mono
     }
     
     [UIBinding(prefab = "HeroAttributeWidget")]
-    public partial class HeroAttributeWidget : UIComponent
+    public partial class HeroAttributeWidget : ItemWidgetBasic
     {
+        public int lanID;
         private void Init()
         {
         }
@@ -32,6 +33,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            base.AddButtonEvent();
         }
 
         public void CustomInit(HeroAttributeData data)
@@ -40,5 +42,13 @@ namespace Fort23.Mono
             Text_Value.text = data.currentValue;
             Text_NextValue.text = data.nextValue;
         }
+        
+        public void CustomInit1(int lanId ,HeroAttributeData data)
+        {
+            lanID = lanId;
+            Text_Name.text = data.name;
+            Text_Value.text = data.currentValue;
+            Text_NextValue.text = data.nextValue;
+        }
     }
 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
                     for (var i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs.Length; i++)
                     {
                         bool isHave = false;
-                        for (var i1 = 1; i1 < breakthroughItemWidgets.Count; i1++)
+                        for (var i1 = 0; i1 < breakthroughItemWidgets.Count; i1++)
                         {
                             if (breakthroughItemWidgets[i1].itemInfo != null &&
                                 PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i] ==
@@ -141,8 +141,8 @@ namespace Fort23.Mono
 
                         if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                         {
-                            heroInformationPanel.root.SetActive(false);
-                            heroInformationPanel.AttributeBg.SetActive(false);
+                            // heroInformationPanel.root.SetActive(false);
+                            // heroInformationPanel.AttributeBg.SetActive(false);
                             type1 = 4;
                         }
 
@@ -197,9 +197,9 @@ namespace Fort23.Mono
                         else
                         {
                             AudioManager.Instance.PlayAudio("ui_tupo.wav");
-                            heroInformationPanel.RecoverDujie();
-                            heroInformationPanel.root.SetActive(false);
-                            heroInformationPanel.AttributeBg.SetActive(true);
+                            // heroInformationPanel.RecoverDujie();
+                            // heroInformationPanel.root.SetActive(false);
+                            // heroInformationPanel.AttributeBg.SetActive(true);
                             UIManager.Instance.HideUIUIPanel(this);
                             TitlePanel.ClosePanel();
                             heroInformationPanel.UpHero(3, nextHeroInfo);
@@ -432,7 +432,7 @@ namespace Fort23.Mono
                         ? 0
                         : heroPowerUpConfig.DujieItemIDs.Length;
                     for (int i = 0;
-                         i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + dujieItemCount;
+                         i < heroPowerUpConfig.DujieMustItemIDs.Length + dujieItemCount;
                          i++)
                     {
                         cTaskAwaitBuffer.AddTask(
@@ -441,19 +441,19 @@ namespace Fort23.Mono
 
                     breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
 
-                    breakthroughItemWidgets[0].CustomInit(1, 0, false);
+                    // breakthroughItemWidgets[0].CustomInit(1, 0, false);
 
 
                     //必选道具
                     for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
                     {
-                        breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
+                        breakthroughItemWidgets[i ].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
                     }
 
                     //可选道具
                     for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
                     {
-                        breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+                        breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length ]
                             .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
                     }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs

@@ -31,21 +31,35 @@ namespace Fort23.Mono
 
         int type;
 
-        public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(int type, List<HeroAttributeData> heroAttributes)
+        public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(int type,
+            List<HeroAttributeData> heroAttributes)
         {
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
-            heroBreakthroughSuccessPanel.CustomInit(type, heroAttributes);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null, UILayer.Top,
+                    uiData: new object[] { type, heroAttributes }, isShowBG: true);
+            // heroBreakthroughSuccessPanel.CustomInit(type, heroAttributes);
             return heroBreakthroughSuccessPanel;
         }
 
-        public async void CustomInit(int type, List<HeroAttributeData> heroAttributes)
+
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            int type = int.Parse(uiData[0].ToString());
+            List<HeroAttributeData> heroAttributes = uiData[1] as List<HeroAttributeData>;
+            await CustomInit(type, heroAttributes);
+            return await base.AsyncInit(uiData);
+        }
+
+        public async CTask CustomInit(int type, List<HeroAttributeData> heroAttributes)
         {
             // HeroInfo heroInfo = new HeroInfo();
             HeroInfo heroInfo = PlayerManager.Instance.myHero.CopyHero();
-            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId, PlayerManager.Instance.myHero.heroData.heroPowerId - 1);
-            Text_NextJIngjie.text = LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
-                                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
-                                                       LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                PlayerManager.Instance.myHero.heroData.heroPowerId - 1);
+            Text_NextJIngjie.text =
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
 
             Text_CurretnJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                        LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]) +
@@ -65,13 +79,15 @@ namespace Fort23.Mono
             {
                 if (type == 1)
                 {
-                    HeroAttributeWidgetType1 heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType1>(null, AttributeRoot);
+                    HeroAttributeWidgetType1 heroAttributeWidget =
+                        await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType1>(null, AttributeRoot);
                     heroAttributeWidget.CustomInit(heroAttributeData);
                     heroAttributeWidgets.Add(heroAttributeWidget);
                 }
                 else
                 {
-                    HeroAttributeWidgetType2 heroAttributeWidget = await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType2>(null, AttributeRoot);
+                    HeroAttributeWidgetType2 heroAttributeWidget =
+                        await UIManager.Instance.CreateGComponent<HeroAttributeWidgetType2>(null, AttributeRoot);
                     heroAttributeWidget.CustomInit(heroAttributeData);
                     heroAttributeWidgets.Add(heroAttributeWidget);
                 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroHerlp.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using Fort23.Core;
 using GameLogic.Hero;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -11,51 +12,62 @@ namespace Fort23.Mono
             List<HeroAttributeData> heroAttributeDataList = new List<HeroAttributeData>();
             if (currentHero.powerUpConfig.ShenshiMax != newHero.powerUpConfig.ShenshiMax)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), "" + newHero.powerUpConfig.ShenshiMax.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    "" + newHero.powerUpConfig.ShenshiMax.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.hp != newHero.hp)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToString(), "" + newHero.hp.Value.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToStringEx(),
+                    "" + newHero.hp.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.attack != newHero.attack)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToString(), "" + newHero.attack.Value.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToStringEx(),
+                    "" + newHero.attack.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.defense != newHero.defense)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御", currentHero.defense.Value.ToString(), "" + newHero.defense.Value.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御",
+                    currentHero.defense.Value.ToStringEx(), "" + newHero.defense.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率", currentHero.powerUpConfig.MPFactor.ToString(), "" + currentHero.powerUpConfig.MPFactor.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率",
+                    currentHero.powerUpConfig.MPFactor.ToString(), "" + currentHero.powerUpConfig.MPFactor.ToString());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率", currentHero.powerUpConfig.HudunFactor.ToString(), "" + currentHero.powerUpConfig.HudunFactor.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率",
+                    currentHero.powerUpConfig.HudunFactor.ToString(),
+                    "" + currentHero.powerUpConfig.HudunFactor.ToString());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K", currentHero.powerUpConfig.defK.ToString(), "" + currentHero.powerUpConfig.defK.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K",
+                    currentHero.powerUpConfig.defK.ToStringEx(), "" + currentHero.powerUpConfig.defK.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), "" + currentHero.powerUpConfig.ShenshiMax.ToString());
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    "" + currentHero.powerUpConfig.ShenshiMax.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
@@ -68,51 +80,65 @@ namespace Fort23.Mono
             List<HeroAttributeData> heroAttributeDataList = new List<HeroAttributeData>();
             if (currentHero.powerUpConfig.ShenshiMax != newHero.powerUpConfig.ShenshiMax)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), newHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    newHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.hp != newHero.hp)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToString(), newHero.hp.Value - currentHero.hp.Value + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToStringEx(),
+                    (newHero.hp.Value - currentHero.hp.Value).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.attack != newHero.attack)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToString(), newHero.attack.Value - currentHero.attack.Value + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToStringEx(),
+                    (newHero.attack.Value - currentHero.attack.Value).ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.defense != newHero.defense)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御", currentHero.defense.Value.ToString(), newHero.defense.Value - currentHero.defense.Value + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御",
+                    currentHero.defense.Value.ToStringEx(),
+                    (newHero.defense.Value - currentHero.defense.Value).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率", currentHero.powerUpConfig.MPFactor.ToString(), currentHero.powerUpConfig.MPFactor - currentHero.powerUpConfig.MPFactor + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率",
+                    currentHero.powerUpConfig.MPFactor.ToString(),
+                    currentHero.powerUpConfig.MPFactor - currentHero.powerUpConfig.MPFactor + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率", currentHero.powerUpConfig.HudunFactor.ToString(), currentHero.powerUpConfig.HudunFactor - currentHero.powerUpConfig.HudunFactor + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率",
+                    currentHero.powerUpConfig.HudunFactor.ToString(),
+                    currentHero.powerUpConfig.HudunFactor - currentHero.powerUpConfig.HudunFactor + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K", currentHero.powerUpConfig.defK.ToString(), currentHero.powerUpConfig.defK - currentHero.powerUpConfig.defK + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K",
+                    currentHero.powerUpConfig.defK.ToStringEx(),
+                    (currentHero.powerUpConfig.defK - currentHero.powerUpConfig.defK).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限", currentHero.powerUpConfig.ShenshiMax.ToString(), currentHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
+                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+                    (currentHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -12,6 +12,7 @@ using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.UI;
+using Utility;
 using Utility.CTween;
 
 
@@ -253,22 +254,22 @@ namespace Fort23.Mono
             HeroAttributeWidget heroAttributeWidget =
                 await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("生命",
-                PlayerManager.Instance.myHero.hp.Value.ToString(),
-                "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToString()));
+                PlayerManager.Instance.myHero.hp.Value.ToStringEx(),
+                "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("攻击",
-                PlayerManager.Instance.myHero.attack.Value.ToString(),
-                "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToString()));
+                PlayerManager.Instance.myHero.attack.Value.ToStringEx(),
+                "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
             heroAttributeWidget.CustomInit(new HeroAttributeData("防御",
-                PlayerManager.Instance.myHero.defense.Value.ToString(),
-                "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToString()));
+                PlayerManager.Instance.myHero.defense.Value.ToStringEx(),
+                "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             Slider_Exp.maxValue = PlayerManager.Instance.myHero.powerUpConfig.levelUpExp;
@@ -608,6 +609,7 @@ namespace Fort23.Mono
             DujiePanelAnim.Play("guodu_idle");
             root.SetActive(true);
             AttributeBg.SetActive(true);
+            fx_ui_tupo2.gameObject.SetActive(false);
         }
 
 
@@ -635,30 +637,36 @@ namespace Fort23.Mono
                     await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
                 await heroBreakthroughSuccessPanel.UIClosed();
                 CustomInit();
+
                 TitlePanel.OpenPanel();
             }
             //渡劫
             else if (type == 3)
             {
-                // heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
                 PlayerManager.Instance.myHero.heroData.isYuanMan = false;
                 PlayerManager.Instance.myHero.Upgrade();
-                HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel();
+                HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel(heroAttributData);
                 await heroTuPoSuccessPanel.UIClosed();
-                heroInformationPanel.root.SetActive(true);
-                heroInformationPanel.AttributeBg.SetActive(true);
+                // heroInformationPanel.root.SetActive(true);
+                // heroInformationPanel.AttributeBg.SetActive(true);
                 CustomInit();
+                heroInformationPanel.RecoverDujie();
                 TitlePanel.OpenPanel();
             }
             //圆满
             else if (type == 4)
             {
                 PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+                fx_ui_tupo2.gameObject.SetActive(true);
+                await TimerComponent.Instance.WaitAsync(500);
                 HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
                 await herYuanManSuccessPanel.UIClosed();
-                heroInformationPanel.root.SetActive(true);
-                heroInformationPanel.AttributeBg.SetActive(true);
                 CustomInit();
+                heroInformationPanel.RecoverDujie();
+                // heroInformationPanel.root.SetActive(true);
+                // heroInformationPanel.AttributeBg.SetActive(true);
+
                 TitlePanel.OpenPanel();
             }
         }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanelData.cs

@@ -406,6 +406,17 @@ namespace Fort23.Mono
 	      return _AttributeBg;
 	     }
 	   }
+	  private GameObject _fx_ui_tupo2;
+	  public GameObject fx_ui_tupo2
+	   {
+	   get{
+	      if (_fx_ui_tupo2 == null)
+	       {
+	         _fx_ui_tupo2  = GetUIUnit<GameObject>("fx_ui_tupo2"); 
+	       }
+	      return _fx_ui_tupo2;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanel.cs

@@ -10,6 +10,8 @@ namespace Fort23.Mono
     [UIBinding(prefab = "HeroTuPoSuccessPanel")]
     public partial class HeroTuPoSuccessPanel : UIPanel
     {
+        List<UIComponent> heroAttributeWidgets = new List<UIComponent>();
+
         private void Init()
         {
         }
@@ -27,14 +29,37 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public async static CTask<HeroTuPoSuccessPanel> OpenPanel()
+        public async static CTask<HeroTuPoSuccessPanel> OpenPanel(List<HeroAttributeData> heroAttributeDatas)
         {
             HeroTuPoSuccessPanel heroBreakthroughSuccessPanel =
-                await UIManager.Instance.LoadAndOpenPanel<HeroTuPoSuccessPanel>(null, UILayer.Top);
-            heroBreakthroughSuccessPanel.CustomInit();
+                await UIManager.Instance.LoadAndOpenPanel<HeroTuPoSuccessPanel>(null, UILayer.Top,
+                    uiData: new object[] { heroAttributeDatas });
             return heroBreakthroughSuccessPanel;
         }
 
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            foreach (var heroAttributeWidget in heroAttributeWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(heroAttributeWidget);
+            }
+
+            heroAttributeWidgets.Clear();
+
+            List<HeroAttributeData> heroAttributeDatas = uiData[0] as List<HeroAttributeData>;
+
+            foreach (var heroAttributeData in heroAttributeDatas)
+            {
+                HeroAttributeWidget heroAttributeWidget =
+                    await UIManager.Instance.CreateGComponent<HeroAttributeWidget>(null, AttributeRoot);
+                heroAttributeWidget.CustomInit(heroAttributeData);
+                heroAttributeWidgets.Add(heroAttributeWidget);
+            }
+
+            CustomInit();
+            return await base.AsyncInit(uiData);
+        }
+
         public async void CustomInit()
         {
             // HeroInfo heroInfo = new HeroInfo();
@@ -48,5 +73,17 @@ namespace Fort23.Mono
             Text_CurretnJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
                                        LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]);
         }
+
+        public override CTask Close()
+        {
+            foreach (var heroAttributeWidget in heroAttributeWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(heroAttributeWidget);
+            }
+
+            heroAttributeWidgets.Clear();
+
+            return base.Close();
+        }
     }
 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanelData.cs

@@ -63,6 +63,17 @@ namespace Fort23.Mono
 	      return _Icon_Dj;
 	     }
 	   }
+	  private RectTransform _AttributeRoot;
+	  public RectTransform AttributeRoot
+	   {
+	   get{
+	      if (_AttributeRoot == null)
+	       {
+	         _AttributeRoot  = GetUIUnit<RectTransform>("AttributeRoot"); 
+	       }
+	      return _AttributeRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs

@@ -31,7 +31,7 @@ namespace Fort23.Mono
 
         private void ItemUpdateEvent(IEventData e)
         {
-            CustomInit(breakthrough, callBack);
+            CustomInit();
         }
 
         protected override void DelEvent()
@@ -53,14 +53,20 @@ namespace Fort23.Mono
             Btn_Source.onClick.AddListener(() => { ItemSourcePanel.OpenPanel(itemConfig.ID); });
         }
 
-        public void CustomInit(BreakthroughItemWidget breakthroughItemWidget, Action callBack)
+        public override CTask<bool> AsyncInit(object[] uiData)
         {
-            this.callBack = callBack;
-            breakthrough = breakthroughItemWidget;
+            breakthrough = uiData[0] as BreakthroughItemWidget;
+            this.callBack = uiData[1] as Action;
             weidgetFater = breakthrough.transform.parent;
             breakthrough.transform.SetParent(this.transform);
             breakthrough.Icon_Select.gameObject.SetActive(true);
-            itemConfig = ConfigComponent.Instance.Get<ItemConfig>(breakthroughItemWidget.itemId);
+            CustomInit();
+            return base.AsyncInit(uiData);
+        }
+
+        public void CustomInit()
+        {
+            itemConfig = ConfigComponent.Instance.Get<ItemConfig>(breakthrough.itemId);
 
             Text_ItemName.text = LanguageManager.Instance.Text(itemConfig.itemName);
             Text_ItemDesc.text = LanguageManager.Instance.Text(itemConfig.itemDesc);
@@ -68,7 +74,6 @@ namespace Fort23.Mono
             if (itemConfig.itemTag == 3)
             {
                 Text_SucceedDesc.text = $"+{itemConfig.associateVlaue[2]}%";
-                // Text_FailDesc.text = $"-{itemConfig.associateVlaue[3]}%";
             }
             else
             {
@@ -77,7 +82,7 @@ namespace Fort23.Mono
 
             if (breakthrough.itemInfo == null)
             {
-                if (PlayerManager.Instance.BagController.IsEnough(breakthroughItemWidget.itemId, 1))
+                if (PlayerManager.Instance.BagController.IsEnough(breakthrough.itemId, 1))
                 {
                     Text_Affirm.text = "使用";
                     Btn_Affirm.gameObject.SetActive(true);
@@ -115,9 +120,8 @@ namespace Fort23.Mono
         {
             SelectBreakthroughItemPanel selectBreakthroughItemPanel =
                 await UIManager.Instance.LoadAndOpenPanel<SelectBreakthroughItemPanel>(null, UILayer.Middle,
+                    uiData: new object[] { breakthroughItemWidget, callBack },
                     isFocus: false);
-
-            selectBreakthroughItemPanel.CustomInit(breakthroughItemWidget, callBack);
             return selectBreakthroughItemPanel;
         }
     }

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoAttributeWidget.cs

@@ -1,5 +1,6 @@
 using GameLogic.Hero;
 using UnityEngine;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -30,13 +31,13 @@ namespace Fort23.Mono
             this.faBaoInfo = faBaoInfo;
             this.key = key;
             Text_AttributeName.text = GetAttributeName(key);
-            Text_AttributeValue.text = faBaoInfo.attriButedIC[key].ToString();
+            Text_AttributeValue.text = faBaoInfo.attriButedIC[key].ToStringEx();
             Text_NextAttributeValue.gameObject.SetActive(false);
         }
 
         public void StartUpGrad(FaBaoInfo nextFabaoInfo)
         {
-            Text_NextAttributeValue.text = $"+{nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]}";
+            Text_NextAttributeValue.text = $"+{(nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]).ToStringEx()}";
             Text_NextAttributeValue.gameObject.SetActive(true);
             Text_NextAttributeValue.color = new Color32(15,241,150,255);
         }
@@ -53,7 +54,7 @@ namespace Fort23.Mono
                 
                 long nextValue = nextFabaoInfo.attriButedIC.ContainsKey(key) ? nextFabaoInfo.attriButedIC[key] : 0;
                 
-                Text_NextAttributeValue.text = $"+{ faBaoInfo.attriButedIC[key] - nextValue}";
+                Text_NextAttributeValue.text = $"+{(faBaoInfo.attriButedIC[key] - nextValue).ToStringEx()}";
                 Text_NextAttributeValue.gameObject.SetActive(true);
                 Text_NextAttributeValue.color = new Color32(15,241,150,255);
                 // Icon_Bj.gameObject.SetActive(true);
@@ -64,11 +65,11 @@ namespace Fort23.Mono
                 long nextValue = nextFabaoInfo.attriButedIC.ContainsKey(key) ? nextFabaoInfo.attriButedIC[key] : 0;
                 if (nextValue == 0)
                 {
-                    Text_NextAttributeValue.text = $"{nextValue - faBaoInfo.attriButedIC[key]}";
+                    Text_NextAttributeValue.text = $"{(nextValue - faBaoInfo.attriButedIC[key]).ToStringEx()}";
                 }
                 else
                 {
-                    Text_NextAttributeValue.text = $"-{nextValue - faBaoInfo.attriButedIC[key]}";
+                    Text_NextAttributeValue.text = $"-{(nextValue - faBaoInfo.attriButedIC[key]).ToStringEx()}";
                 }
                
                 Text_NextAttributeValue.gameObject.SetActive(true);

Assets/Scripts/GameUI/UI/MainHeroPnael/ItemWidgetType1.cs

@@ -51,11 +51,11 @@ namespace Fort23.Mono
             if (count > PlayerManager.Instance.BagController.GetItemCount(id))
             {
                 Text_Count.text =
-                    $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}</color>/{count}";
+                    $"<color=red>{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}</color>/{count.ToStringEx()}";
             }
             else
             {
-                Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count}";
+                Text_Count.text = $"{PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx()}/{count.ToStringEx()}";
             }
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -122,28 +122,32 @@ namespace Fort23.Mono
             HeroAttributeWidget heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("生命", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10712, new HeroAttributeData("生命", "",
                 PlayerManager.Instance.myHero.hp.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("攻击", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10713, new HeroAttributeData("攻击", "",
                 PlayerManager.Instance.myHero.attack.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("防御", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10714, new HeroAttributeData("防御", "",
                 PlayerManager.Instance.myHero.defense.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("攻击速度", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10715, new HeroAttributeData("攻击速度", "",
                 PlayerManager.Instance.myHero.attSpeed.Value.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -151,39 +155,50 @@ namespace Fort23.Mono
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("金灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10716, new HeroAttributeData("金灵根", "",
                 PlayerManager.Instance.myHero.Metal.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("木灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10717, new HeroAttributeData("木灵根", "",
                 PlayerManager.Instance.myHero.Wood.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("水灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10718, new HeroAttributeData("水灵根", "",
                 PlayerManager.Instance.myHero.Water.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("火灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10719, new HeroAttributeData("火灵根", "",
                 PlayerManager.Instance.myHero.Fire.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("土灵根", "",
+            heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
+            heroAttributeWidget.CustomInit1(10720, new HeroAttributeData("土灵根", "",
                 PlayerManager.Instance.myHero.Earth.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
         }
 
+        private void heroAttributeWidgetOnClick(ItemWidgetBasic obj)
+        {
+            HeroAttributeWidget heroAttributeWidget = obj as HeroAttributeWidget;
+            TipMessagePanel.OpenTipMessagePanel(heroAttributeWidget.lanID);
+        }
+
         private async void OnClick(ItemWidgetBasic obj)
         {
             BtnFaBaoWidget btnFaBaoWidget = obj as BtnFaBaoWidget;

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -223,7 +223,7 @@ namespace Fort23.Mono
                 }
 
                 Text_NextLv.text = "+1";
-                Text_NextPower.text = "+" + (nextFabaoInfo.qiangDu - selectedFaBaoInfo.qiangDu);
+                Text_NextPower.text = "+" + (nextFabaoInfo.qiangDu - selectedFaBaoInfo.qiangDu).ToStringEx();
                 Text_NextLv.color = new Color32(15, 241, 150, 255);
                 Text_NextPower.color = new Color32(15, 241, 150, 255);
                 Text_NextLv.gameObject.SetActive(true);
@@ -252,7 +252,7 @@ namespace Fort23.Mono
                     {
                         Text_NextLv.gameObject.SetActive(true);
                         Text_NextLv.text =
-                            $"+{selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID}";
+                            $"+{(selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID).ToStringEx()}";
                         Text_NextLv.color = new Color32(15, 241, 150, 255);
 
                         // Icon_LvBj.icon_name = "dec_fbjia";
@@ -260,7 +260,7 @@ namespace Fort23.Mono
                     else if (selectedFaBaoInfo.FabaoPowerupConfig.ID < currentFaBaoInfo.FabaoPowerupConfig.ID)
                     {
                         Text_NextLv.text =
-                            $"{selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID}";
+                            $"{(selectedFaBaoInfo.FabaoPowerupConfig.ID - currentFaBaoInfo.FabaoPowerupConfig.ID).ToStringEx()}";
                         Text_NextLv.color = new Color32(235, 110, 109, 255);
                         Text_NextLv.gameObject.SetActive(true);
                         // Icon_LvBj.icon_name = "dec_fbjian";
@@ -272,14 +272,14 @@ namespace Fort23.Mono
 
                     if (currentFaBaoInfo == null || selectedFaBaoInfo.qiangDu > currentFaBaoInfo.qiangDu)
                     {
-                        Text_NextPower.text = $"+{selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu}";
+                        Text_NextPower.text = $"+{(selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu).ToStringEx()}";
                         Text_NextPower.color = new Color32(15, 241, 150, 255);
                         Text_NextPower.gameObject.SetActive(true);
                         // Icon_PowrBj.icon_name = "dec_bjia";
                     }
                     else if (selectedFaBaoInfo.qiangDu < currentFaBaoInfo.qiangDu)
                     {
-                        Text_NextPower.text = $"{selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu}";
+                        Text_NextPower.text = $"{(selectedFaBaoInfo.qiangDu - currentFaBaoInfo.qiangDu).ToStringEx()}";
                         Text_NextPower.color = new Color32(235, 110, 109, 255);
                         Text_NextPower.gameObject.SetActive(true);
                         // Icon_PowrBj.icon_name = "dec_fbjian";
@@ -474,7 +474,7 @@ namespace Fort23.Mono
             {
                 Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." +
                                       faBaoInfo.FabaoPowerupConfig.ID;
-                Text_Power.text = $"{LanguageManager.Instance.Text(10197)}：{faBaoInfo.qiangDu}";
+                Text_Power.text = $"{LanguageManager.Instance.Text(10197)}：{faBaoInfo.qiangDu.ToStringEx()}";
                 Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
                     faBaoInfo.effectValue);
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -158,7 +158,7 @@ namespace Fort23.Mono
 
         private void ChagneShenshiBtnActive()
         {
-            // Btn_Event.gameObject.SetActive(event > 0);
+            Btn_StartEvent.gameObject.SetActive(AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e => !e.isCompleted &&  !e.isCompleted1)!= null);
         }
 
         protected override void DelEvent()
@@ -223,8 +223,14 @@ namespace Fort23.Mono
 
                 AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e =>
                     e.guid == AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId);
+                if (eventList == null)
+                {
+                    return;
+                }
 
                 EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+
+
                 if (eventConfig.EventTriggerType == 4)
                 {
                     if (eventList.isCompleted1)
@@ -313,6 +319,7 @@ namespace Fort23.Mono
 
 
             int bl = (int)((heroAllexp / allexp) * 100);
+            bl = bl > 100 ? 100 : bl;
 
             Text_jingjie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +

Assets/Scripts/GameUI/UI/ShopPanel/EnergyWidget.cs

@@ -6,6 +6,7 @@ using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
 using UnityEngine;
+using UnityEngine.UI;
 using Utility;
 
 namespace Fort23.Mono
@@ -67,6 +68,8 @@ namespace Fort23.Mono
             _itemConfig = ConfigComponent.Instance.Get<ItemConfig>(id);
             Icon_Energy.icon_name = _itemConfig.icon;
             Text_Count.text = PlayerManager.Instance.BagController.GetItemCount(id).ToStringEx();
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>());
         }
     }
 }

Assets/Scripts/GameUI/UI/TowerPanel/TowerLevelWidget.cs

@@ -40,8 +40,12 @@ namespace Fort23.Mono
                 }
 
                 List<ItemInfo> itemInfos = new List<ItemInfo>();
-                ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[0], 1);
-                itemInfos.Add(itemInfo);
+                for (var i = 0; i < _towerInfoConfig.reward.Length; i++)
+                {
+                    ItemInfo itemInfo = new ItemInfo(_towerInfoConfig.reward[i], 1);
+                    itemInfos.Add(itemInfo);
+                }
+             
                 towerLevelData.reward = true;
                 AccountFileInfo.Instance.SavePlayerData();
                 RewardsPanel rewardsPanel = await RewardsPanel.OpenPanel(itemInfos);

XiuXianGame.sln.DotSettings.user

@@ -20,6 +20,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F23_003Fdf7b38e0_003FComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACrasheyeLib_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5d871a7d0a7c4e15870b62fc01af92731a00_003F61_003Fdc27fc5d_003FCrasheyeLib_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACultureInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F69_003F81b4a42b_003FCultureInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACustomRenderTexture_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F8f_003F8149d2e1_003FCustomRenderTexture_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fc9_003Fe80e9cbf_003FDictionary_00602_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>