Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CX8btSypVS3IM6qqVp63v9+JRDxF1VvbfReW8kQ5jDRFPm79kJ/1kAG0+adV
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventConfig.json

@@ -1451,7 +1451,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 1,
       "XiantuID": 1,
       "EventName": 4259,
       "Description": 0
@@ -1484,7 +1484,7 @@
       "RefreshProbability": 0,
       "RefreshCount": 0,
       "placeID": 1,
-      "SmallPlacesId": 0,
+      "SmallPlacesId": 1,
       "XiantuID": 1,
       "EventName": 4028,
       "Description": 4103
@@ -4895,7 +4895,7 @@
       "RefreshProbability": 35,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 2,
       "EventConditionId": [
         3
@@ -4935,7 +4935,7 @@
       "RefreshProbability": 35,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 2,
       "EventConditionId": [
         10,
@@ -4977,7 +4977,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 2,
       "EventConditionId": [
         10,
@@ -5020,7 +5020,7 @@
       "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 3,
       "EventConditionId": [
         10,
@@ -5059,7 +5059,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 3,
       "EventConditionId": [
         10,
@@ -5116,7 +5116,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 1,
+      "SmallPlacesId": 0,
       "XiantuID": 3,
       "EventConditionId": [
         1
@@ -5297,7 +5297,7 @@
       "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 3,
+      "SmallPlacesId": 0,
       "XiantuID": 5,
       "EventConditionId": [
         10,
@@ -5338,7 +5338,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 3,
+      "SmallPlacesId": 0,
       "XiantuID": 5,
       "EventConditionId": [
         10,
@@ -5390,7 +5390,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 3,
+      "SmallPlacesId": 0,
       "XiantuID": 5,
       "EventConditionId": [
         10,
@@ -5454,7 +5454,7 @@
       "RefreshProbability": 40,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5492,7 +5492,7 @@
       "RefreshProbability": 35,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5532,7 +5532,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5573,7 +5573,7 @@
       "RefreshProbability": 25,
       "RefreshCount": 1,
       "placeID": 1,
-      "SmallPlacesId": 4,
+      "SmallPlacesId": 0,
       "XiantuID": 6,
       "EventConditionId": [
         10,
@@ -5617,7 +5617,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 7,
       "EventConditionId": [
         10,
@@ -5659,7 +5659,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 7,
       "EventConditionId": [
         10,
@@ -5711,7 +5711,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 7,
       "EventConditionId": [
         10,
@@ -5753,7 +5753,7 @@
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 8,
       "EventConditionId": [
         10,
@@ -5792,7 +5792,7 @@
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 8,
       "EventConditionId": [
         10,
@@ -5842,7 +5842,7 @@
       "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 5,
+      "SmallPlacesId": 0,
       "XiantuID": 8,
       "EventConditionId": [
         10,

Assets/Res/Config/GroupConfig.json

@@ -637,6 +637,12 @@
         5007
       ]
     },
+    {
+      "ID": 4026,
+      "GroupMonster": [
+        1008
+      ]
+    },
     {
       "ID": 5001,
       "GroupMonster": [

Assets/Res/Config/LanguageChineseConfig.json

@@ -7850,43 +7850,43 @@
     },
     {
       "ID": 1963,
-      "txt": "道友_1_介绍文本1"
+      "txt": "小时候父母被大风卷走，她与姐姐云枝相依为命，躲在树林玩耍以避险。"
     },
     {
       "ID": 1964,
-      "txt": "道友_1_介绍文本2"
+      "txt": "雀灵儿的姐姐，北海密径的守护者，化形为优雅女子，守护妹妹免受危害。"
     },
     {
       "ID": 1965,
-      "txt": "道友_1_介绍文本3"
+      "txt": "疯道人的妹妹，出身云隐宗，有勇有谋，偶然发现宗门异常，开始暗中调查真相。"
     },
     {
       "ID": 1966,
-      "txt": "道友_2_介绍文本1"
+      "txt": "许由的妹妹，出身幽山秘境家族，性格恬淡，擅长种植和煮茶。"
     },
     {
       "ID": 1967,
-      "txt": "道友_2_介绍文本2"
+      "txt": "云隐宗内门弟子，性格活波可爱，对阵法研究比较感兴趣。"
     },
     {
       "ID": 1968,
-      "txt": "道友_2_介绍文本3"
+      "txt": "云隐宗内门弟子，心思缜密，为云隐宗执行各种秘密任务。"
     },
     {
       "ID": 1969,
-      "txt": "道友_3_介绍文本1"
+      "txt": "山林隐士，拒绝尧让天下，出身幽山秘境，隐居修道，喜爱炼丹与品茶。"
     },
     {
       "ID": 1970,
-      "txt": "道友_3_介绍文本2"
+      "txt": "看似疯疯癫癫，浑身散发着经年未洗的酸腐气，却又总能诡异地维持着平衡。"
     },
     {
       "ID": 1971,
-      "txt": "道友_3_介绍文本3"
+      "txt": "散修，喜欢在各地游历，对世间的天材地宝颇有研究。"
     },
     {
       "ID": 1972,
-      "txt": "道友_4_介绍文本1"
+      "txt": "师承不详，和师妹相依为命，对法宝锻造颇有研究。"
     },
     {
       "ID": 1973,
@@ -13366,7 +13366,7 @@
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10545,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10546,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10547,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10548,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10549,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10550,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10551,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10552,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10553,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10554,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10555,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10556,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10557,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10558,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10559,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10560,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10561,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10562,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10563,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10564,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10565,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10566,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10567,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10568,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10569,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10570,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10571,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10572,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10573,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10574,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10575,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10576,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10577,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10578,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10579,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10580,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10581,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10582,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10583,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10584,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10585,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10586,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10587,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10588,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10589,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10590,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10591,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10592,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10593,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10594,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10595,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10596,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10597,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10598,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10599,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10600,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10601,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10602,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10603,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10604,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10605,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10606,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10607,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10608,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10609,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10610,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10611,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10612,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10613,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10614,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10615,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10616,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10617,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10618,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10619,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10620,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10621,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10622,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10623,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10624,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10625,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10626,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10627,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10628,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10629,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10630,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10631,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10632,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10633,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10634,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10635,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10636,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10637,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10638,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10639,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10640,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10641,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10642,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10643,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10644,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10645,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10646,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10647,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10648,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10649,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10650,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10651,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10652,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10653,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10654,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10655,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10656,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10657,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10658,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10659,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10660,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10661,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10662,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10663,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10664,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10665,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10666,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10667,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10668,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10669,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10670,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10671,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10672,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10673,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10674,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10675,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10676,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10677,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10678,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10679,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10680,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10681,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10682,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10683,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10684,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10685,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10686,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10687,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 10688,

Assets/Res/Config/LevelbattleConfig.json

@@ -610,6 +610,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 4026,
+      "Group": [
+        4026
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 5001,
       "Group": [

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -187,7 +187,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -352,7 +352,7 @@ RectTransform:
   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: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533
 CanvasGroup:
@@ -2117,7 +2117,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -177,7 +177,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -536,10 +536,10 @@ RectTransform:
   - {fileID: 6652087719461453211}
   m_Father: {fileID: 3787544951613840147}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -0.5809021, y: -57.711}
-  m_SizeDelta: {x: 625.863, y: 320.8}
+  m_SizeDelta: {x: -18.137024, y: -141.20001}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6748753096610578173
 CanvasRenderer:

Assets/Res/UI/CombatPanel.prefab

@@ -30,13 +30,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6344764065321965081}
   - {fileID: 4862212743383639915}
   - {fileID: 7940440888945818258}
   - {fileID: 355393275312567652}
-  - {fileID: 2396994004867754637}
+  - {fileID: 6344764065321965081}
   - {fileID: 3575128956283294460}
-  - {fileID: 6110338263307245602}
   - {fileID: 7797822685459092781}
   m_Father: {fileID: 943568758315423495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -129,8 +127,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: -125, y: 0}
-  m_SizeDelta: {x: 251, y: 16}
+  m_AnchoredPosition: {x: -121.000015, y: 0}
+  m_SizeDelta: {x: 242, y: 16}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2476763573105345597
 CanvasRenderer:
@@ -6113,8 +6111,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: -125, y: 0}
-  m_SizeDelta: {x: 250, y: 13}
+  m_AnchoredPosition: {x: -121.000015, y: 0}
+  m_SizeDelta: {x: 241, y: 13}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4080208271281497370
 CanvasRenderer:
@@ -6811,7 +6809,9 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2396994004867754637}
+  - {fileID: 6110338263307245602}
   m_Father: {fileID: 7814751738232836672}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -6994,7 +6994,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: 172.01, y: 17.7}
+  m_AnchoredPosition: {x: 163.85, y: 17.7}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6266451616475677771
@@ -7445,11 +7445,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7814751738232836672}
+  m_Father: {fileID: 3575128956283294460}
   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: -52.100014, y: 36}
+  m_AnchoredPosition: {x: -0, y: 0}
   m_SizeDelta: {x: 68, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4963023395715097639
@@ -7690,11 +7690,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7814751738232836672}
+  m_Father: {fileID: 3575128956283294460}
   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: -55.500008, y: 37.1}
+  m_AnchoredPosition: {x: -3.4000015, y: 1.0999985}
   m_SizeDelta: {x: 50, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2407304736381725406
@@ -8959,7 +8959,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 6c810ed1e00febb606e0f2b27d925fd9
-  imageH: 0
+  imageH: 30
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -9317,7 +9317,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -27.2, y: 4.98}
-  m_SizeDelta: {x: 250, y: 15}
+  m_SizeDelta: {x: 242, y: 15}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6934183408135190191
 CanvasRenderer:
@@ -9741,7 +9741,7 @@ RectTransform:
   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: 1170, y: 2532}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -842,7 +842,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: -263.7, y: 355.53}
+  m_AnchoredPosition: {x: -263.7, y: 340.7781}
   m_SizeDelta: {x: 164.0966, y: 204.2354}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4755960994092275630
@@ -1257,7 +1257,7 @@ 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: 271.7, y: 54.325}
+  m_AnchoredPosition: {x: 271.7, y: 37.824966}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7359437752171597100
@@ -2853,7 +2853,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.3921, y: 359.75186}
+  m_AnchoredPosition: {x: 1.3921, y: 345}
   m_SizeDelta: {x: 711.1741, y: 212.6871}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8870171658625692314
@@ -2942,7 +2942,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: 68.02026, y: -1.1071}
+  m_AnchoredPosition: {x: 68.02026, y: -17.607136}
   m_SizeDelta: {x: 475.6842, y: 1.8143}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2707776363039189316
@@ -2966,7 +2966,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.95294124, g: 0.8980393, b: 0.6627451, a: 1}
+  m_Color: {r: 0.2405659, g: 0.15144826, b: 0.039716035, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4113,7 +4113,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: -466.3, y: 52.5}
+  m_AnchoredPosition: {x: -466.3, y: 36}
   m_SizeDelta: {x: 61.038, y: 61.9771}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7965205304804970307
@@ -5197,7 +5197,7 @@ 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: 209.3, y: -50.3}
+  m_AnchoredPosition: {x: 209.3, y: -66.80003}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7271376927170581440

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -637,11 +637,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5142448662693722814}
+  m_Father: {fileID: 1062516556747891371}
   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: 0}
+  m_AnchoredPosition: {x: 366, y: 269}
   m_SizeDelta: {x: 62, y: 62}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8716127586724495292
@@ -864,12 +864,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1062516556747891371}
+  m_Father: {fileID: 5142448662693722814}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -9, y: -8}
-  m_SizeDelta: {x: 0, y: 71.377686}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 287, y: 0.5536423}
+  m_SizeDelta: {x: 72, y: 71.377686}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &661607412772170253
 CanvasRenderer:
@@ -892,7 +892,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.59607846, g: 0.3647059, b: 0.90196085, a: 1}
+  m_Color: {r: 0.69145536, g: 0.075671814, b: 0.8443395, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -901,10 +901,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 37
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 5
+    m_MinSize: 3
     m_MaxSize: 76
     m_Alignment: 8
     m_AlignByGeometry: 0
@@ -957,33 +957,33 @@ MonoBehaviour:
     - Target: {fileID: 2679299554753557332}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.59607846, y: 0.3647059, z: 0.90196085, w: 1}
+      - {x: 0.7921569, y: 0.22352941, z: 0.93333334, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4731082921620160257}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.59607846, y: 0.3647059, z: 0.9019608, w: 1}
+      - {x: 0.79116344, y: 0.22467943, z: 0.9339621, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
     - Target: {fileID: 2679299554753557332}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.8431373, y: 0.45882356, z: 0.32156864, w: 1}
+      - {x: 0.9150942, y: 0.3516983, z: 0.112228416, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4731082921620160257}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.84313726, y: 0.45882353, z: 0.32156864, w: 1}
+      - {x: 0.9137255, y: 0.3529412, z: 0.11372549, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
   - {fileID: 2679299554753557332}
   - {fileID: 4731082921620160257}
   AllComsStateTypes: 8000000080000000
-  CurrIndex: 1
+  CurrIndex: 2
 --- !u!1 &2841900498943777658
 GameObject:
   m_ObjectHideFlags: 0
@@ -1944,7 +1944,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.59607846, g: 0.3647059, b: 0.9019608, a: 1}
+  m_Color: {r: 0.6901961, g: 0.07450981, b: 0.84313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2810,7 +2810,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8235294, g: 0.23137255, b: 0.8980392, a: 1}
+  m_Color: {r: 0.7547367, g: 0.39302227, b: 0.8679244, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3337,7 +3337,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8468219431132250151}
-  - {fileID: 868834413672771607}
+  - {fileID: 1737448580674146482}
   m_Father: {fileID: 1062516556747891371}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -3371,7 +3371,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 10.4
+  m_Spacing: 11
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -3743,7 +3743,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8233183, g: 0.2325116, b: 0.8962264, a: 1}
+  m_Color: {r: 0.7529412, g: 0.39215687, b: 0.8666667, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3987,10 +3987,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1737448580674146482}
   - {fileID: 5142448662693722814}
   - {fileID: 7374263567999719867}
   - {fileID: 7957023652684022640}
+  - {fileID: 868834413672771607}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
@@ -4066,13 +4066,13 @@ MonoBehaviour:
     - Target: {fileID: 7313999456231797816}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.89019614, y: 0.78823537, z: 0.41176474, w: 1}
+      - {x: 1, y: 0.86388886, z: 0.38207537, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 5830136030932177828}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.89019614, y: 0.78823537, z: 0.41176474, w: 1}
+      - {x: 0.9811319, y: 0.8078755, z: 0.19900306, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -4131,13 +4131,13 @@ MonoBehaviour:
     - Target: {fileID: 7313999456231797816}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.8233183, y: 0.2325116, z: 0.8962264, w: 1}
+      - {x: 0.7529412, y: 0.39215687, z: 0.8666667, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 5830136030932177828}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.8235294, y: 0.23137255, z: 0.8980392, w: 1}
+      - {x: 0.7547367, y: 0.39302227, z: 0.8679244, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:

Assets/Res/UI/SkillSelectPanel/SkillRoadWidget.prefab

@@ -252,8 +252,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: 73.51247, y: -30.5809}
-  m_SizeDelta: {x: 495.4249, y: 82.7753}
+  m_AnchoredPosition: {x: 73.51247, y: -27.298}
+  m_SizeDelta: {x: 495.4249, y: 105.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8609369702727514854
 CanvasRenderer:
@@ -361,7 +361,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7888252337808105600
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -996,7 +996,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8235294, g: 0.23137255, b: 0.8980392, a: 1}
+  m_Color: {r: 0.976415, g: 0.954368, b: 0.32700682, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -50,6 +50,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 0ca05684ec26a624a9be95c43eaa0897, type: 3}
     - {fileID: 2800000, guid: 7a4d82b8d51add842a86c03efe809031, type: 3}
     - {fileID: 2800000, guid: 17b5819cad711404c975f429ddaacb35, type: 3}
+    - {fileID: 2800000, guid: 6540646f497b7f7448aff9a1910e3817, type: 3}
     - {fileID: 2800000, guid: 7d62cfa675b75a24cb95907fd2de10ca, type: 3}
     - {fileID: 2800000, guid: 471869ab4e95d7148ae33f596ff58701, type: 3}
     - {fileID: 2800000, guid: 6c45afd6bc7e1db429d58030b64f1609, type: 3}

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

@@ -156,7 +156,7 @@ namespace Fort23.Mono
         {
             playerHeroHpWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroHpWidget>(PlayerHpWidget, null);
-            playerHeroHpWidget.size = 250;
+            playerHeroHpWidget.size = 241;
             playerHeroHpWidget.shieldSize = 100;
             playerHeroHpWidget.isFollowTarget = false;
             playerHeroHpWidget.Init(CombatController.currActiveCombat.playerHeroEntity);

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

@@ -189,7 +189,8 @@ namespace Fort23.Mono
                                 combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs[0])
                             + LanguageManager.Instance.Text(
                                 combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
-                            combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjie3;
+                            LanguageManager.Instance.Text(
+                                combatHeroEntity.CurrCombatHeroInfo.powerUpConfig.jingjieLanIDs[2]);
                     }
                     else
                     {

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -218,8 +218,8 @@ namespace Fort23.Mono
             if (itemConfig.quality == 3)
             {
                 QualityCsc.ChangeState(0);
-                
-                Text_Quality.text = LanguageManager.Instance.Text(10795);
+                Text_Quality.text = LanguageManager.Instance.Text(10797);
+              
             }
             else if (itemConfig.quality == 4)
             {
@@ -229,7 +229,7 @@ namespace Fort23.Mono
             else if (itemConfig.quality == 5)
             {
                 QualityCsc.ChangeState(2);
-                Text_Quality.text = LanguageManager.Instance.Text(10797);
+                Text_Quality.text = LanguageManager.Instance.Text(10795);
             }
 
             // skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
@@ -269,7 +269,7 @@ namespace Fort23.Mono
                 
                 case 0:
                     csc.ChangeState(5);
-                    Icon_Attribute.icon_name = "dec_tu2";
+                    Icon_Attribute.icon_name = "dec_fuzhu2";
                     break;
             }
 

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadWidget.cs

@@ -35,7 +35,7 @@ namespace Fort23.Mono
 
             Text_SkillName.text = LanguageManager.Instance.Text(SkillConfig.name);
             Icon_SkillIcon.icon_name = SkillConfig.icon;
-            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(SkillConfig.PromoteLan),
+            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(SkillConfig.dec),
                 SkillConfig.effectValue);
 
             ActiveRoot.SetActive(PlayerManager.Instance.myHero.TaoismSkillId == SkillConfig.ID);

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

@@ -88,9 +88,20 @@ namespace Fort23.Mono
                     await PlayerGuideManager.Instance.SetGuid(4);
                 }
 
-                if (EventSystemManager.Instance.IsEventCompleted(10003) && PlayerGuideManager.Instance.GuideIsCanDo(6))
+                if (EventSystemManager.Instance.IsEventCompleted(10003) && PlayerGuideManager.Instance.GuideIsCanDo(6) && PlayerManager.Instance.myHero.powerUpConfig.jingjie3 != 10)
                 {
-                    await PlayerGuideManager.Instance.SetGuid(6);
+                    int currentMiao =
+                        (int)((TimeHelper.ClientNow() - PlayerManager.Instance.myHero.heroData.upTime) /
+                              1000);
+
+                    float allexp = currentMiao * PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei;
+                    if (PlayerManager.Instance.myHero.heroData.exp + allexp >=
+                        PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
+                    {
+                        await PlayerGuideManager.Instance.SetGuid(6);
+                    }
+
+                  
                 }
             }
         }

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

@@ -67,9 +67,9 @@ namespace Fort23.Mono
 
                 if (currentTowerLevelData == null)
                 {
-                    AccountFileInfo.TowerLevelData towerLevelData = new AccountFileInfo.TowerLevelData();
-                    towerLevelData.id = towerInfoConfig.ID;
-                    _towerData.towerLevelDatas.Add(towerLevelData);
+                    currentTowerLevelData = new AccountFileInfo.TowerLevelData();
+                    currentTowerLevelData.id = towerInfoConfig.ID;
+                    _towerData.towerLevelDatas.Add(currentTowerLevelData);
                     // currentLevelWidget.towerLevelData = towerLevelData;
                     AccountFileInfo.Instance.SavePlayerData();
                 }