Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WS4csSiqUHMgYzJKBRtVy9KRaIrKMF3kQiIGmCeAembxCSzFoaNxlfxqaATT
+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/UIAssets/decorate/dec_xuanxiang_beibao.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CH0etCKuU3y7ETud2HuNd04iacpo8YcrViPXxIcBwJgssIhGgz8LI0kxOmAf
+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/UIAssets/decorate/dec_xuanxiang_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: D3tKt3ysV30z955Od2U29Zu6kkSysUgKkfgjoLFQAoA+8r4pbEokwfxNWwR6
+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/Res/Config/EventLinkConfig.json

@@ -10779,50 +10779,6 @@
         101
       ]
     },
-    {
-      "ID": 3002301,
-      "conciseEventMessage": 5768,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        5769
-      ],
-      "DialogueType": 0,
-      "EventID": 30023,
-      "optionType": 2,
-      "optionPara1": [
-        3014
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        3002302,
-        101
-      ]
-    },
-    {
-      "ID": 3002401,
-      "conciseEventMessage": 5770,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        5771
-      ],
-      "DialogueType": 0,
-      "EventID": 30024,
-      "optionType": 2,
-      "optionPara1": [
-        3015
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        3002402,
-        101
-      ]
-    },
     {
       "ID": 600101,
       "conciseEventMessage": 5825,
@@ -22718,3108 +22674,6 @@
       "EventID": 9162,
       "optionType": 0,
       "ResultType": 0
-    },
-    {
-      "ID": 912501,
-      "conciseEventMessage": 6260,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 134,
-      "LanID": [
-        6261
-      ],
-      "DialogueType": 0,
-      "EventID": 9125,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912502
-      ]
-    },
-    {
-      "ID": 912502,
-      "conciseEventMessage": 6260,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6262
-      ],
-      "DialogueType": 0,
-      "EventID": 9125,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912503
-      ]
-    },
-    {
-      "ID": 912503,
-      "conciseEventMessage": 6260,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 134,
-      "LanID": [
-        6263
-      ],
-      "DialogueType": 0,
-      "EventID": 9125,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912504
-      ]
-    },
-    {
-      "ID": 912504,
-      "conciseEventMessage": 6260,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 134,
-      "LanID": [
-        6264
-      ],
-      "DialogueType": 0,
-      "EventID": 9125,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 912601,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6266
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 1,
-      "optionPara1": [
-        912602,
-        912603
-      ],
-      "optionPara2": [
-        6267,
-        6268
-      ],
-      "ResultType": 1,
-      "ResultOptions": [
-        912602
-      ]
-    },
-    {
-      "ID": 912602,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6269
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912604
-      ]
-    },
-    {
-      "ID": 912603,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6270
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912604
-      ]
-    },
-    {
-      "ID": 912604,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6271
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 2,
-      "optionPara1": [
-        4010
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        912605,
-        101
-      ]
-    },
-    {
-      "ID": 912605,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6272
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912606
-      ]
-    },
-    {
-      "ID": 912606,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6273
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912607
-      ]
-    },
-    {
-      "ID": 912607,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6274
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912608
-      ]
-    },
-    {
-      "ID": 912608,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6275
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912609
-      ]
-    },
-    {
-      "ID": 912609,
-      "conciseEventMessage": 6265,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6276
-      ],
-      "DialogueType": 0,
-      "EventID": 9126,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 912701,
-      "conciseEventMessage": 6277,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 123,
-      "LanID": [
-        6278
-      ],
-      "DialogueType": 0,
-      "EventID": 9127,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912702
-      ]
-    },
-    {
-      "ID": 912702,
-      "conciseEventMessage": 6277,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6279
-      ],
-      "DialogueType": 0,
-      "EventID": 9127,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912703
-      ]
-    },
-    {
-      "ID": 912703,
-      "conciseEventMessage": 6277,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 123,
-      "LanID": [
-        6280
-      ],
-      "DialogueType": 0,
-      "EventID": 9127,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912704
-      ]
-    },
-    {
-      "ID": 912704,
-      "conciseEventMessage": 6277,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6281
-      ],
-      "DialogueType": 0,
-      "EventID": 9127,
-      "optionType": 2,
-      "optionPara1": [
-        4011
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        912705,
-        101
-      ]
-    },
-    {
-      "ID": 912705,
-      "conciseEventMessage": 6277,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6282
-      ],
-      "DialogueType": 0,
-      "EventID": 9127,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912706
-      ]
-    },
-    {
-      "ID": 912706,
-      "conciseEventMessage": 6277,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6283
-      ],
-      "DialogueType": 0,
-      "EventID": 9127,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912707
-      ]
-    },
-    {
-      "ID": 912707,
-      "conciseEventMessage": 6277,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6284
-      ],
-      "DialogueType": 0,
-      "EventID": 9127,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 912801,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 138,
-      "LanID": [
-        6286
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912802
-      ]
-    },
-    {
-      "ID": 912802,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6287
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912803
-      ]
-    },
-    {
-      "ID": 912803,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 138,
-      "LanID": [
-        6288
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912804
-      ]
-    },
-    {
-      "ID": 912804,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6289
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912805
-      ]
-    },
-    {
-      "ID": 912805,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6290
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912806
-      ]
-    },
-    {
-      "ID": 912806,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 138,
-      "LanID": [
-        6291
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912807
-      ]
-    },
-    {
-      "ID": 912807,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6292
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912808
-      ]
-    },
-    {
-      "ID": 912808,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 138,
-      "LanID": [
-        6293
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 2,
-      "optionPara1": [
-        4012
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        912809,
-        101
-      ]
-    },
-    {
-      "ID": 912809,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6294
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912810
-      ]
-    },
-    {
-      "ID": 912810,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6295
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912811
-      ]
-    },
-    {
-      "ID": 912811,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6296
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912812
-      ]
-    },
-    {
-      "ID": 912812,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6297
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912813
-      ]
-    },
-    {
-      "ID": 912813,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6298
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912814
-      ]
-    },
-    {
-      "ID": 912814,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6299
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912815
-      ]
-    },
-    {
-      "ID": 912815,
-      "conciseEventMessage": 6285,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6300
-      ],
-      "DialogueType": 0,
-      "EventID": 9128,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 912901,
-      "conciseEventMessage": 6301,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6302
-      ],
-      "DialogueType": 0,
-      "EventID": 9129,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912902
-      ]
-    },
-    {
-      "ID": 912902,
-      "conciseEventMessage": 6301,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6303
-      ],
-      "DialogueType": 0,
-      "EventID": 9129,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912903
-      ]
-    },
-    {
-      "ID": 912903,
-      "conciseEventMessage": 6301,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6304
-      ],
-      "DialogueType": 0,
-      "EventID": 9129,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912904
-      ]
-    },
-    {
-      "ID": 912904,
-      "conciseEventMessage": 6301,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6305
-      ],
-      "DialogueType": 0,
-      "EventID": 9129,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912905
-      ]
-    },
-    {
-      "ID": 912905,
-      "conciseEventMessage": 6301,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6306
-      ],
-      "DialogueType": 0,
-      "EventID": 9129,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912906
-      ]
-    },
-    {
-      "ID": 912906,
-      "conciseEventMessage": 6301,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6307
-      ],
-      "DialogueType": 0,
-      "EventID": 9129,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        912907
-      ]
-    },
-    {
-      "ID": 912907,
-      "conciseEventMessage": 6301,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6308
-      ],
-      "DialogueType": 0,
-      "EventID": 9129,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913001,
-      "conciseEventMessage": 6309,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6310
-      ],
-      "DialogueType": 0,
-      "EventID": 9130,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913002
-      ]
-    },
-    {
-      "ID": 913002,
-      "conciseEventMessage": 6309,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6311
-      ],
-      "DialogueType": 0,
-      "EventID": 9130,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913003
-      ]
-    },
-    {
-      "ID": 913003,
-      "conciseEventMessage": 6309,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6312
-      ],
-      "DialogueType": 0,
-      "EventID": 9130,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913004
-      ]
-    },
-    {
-      "ID": 913004,
-      "conciseEventMessage": 6309,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6313
-      ],
-      "DialogueType": 0,
-      "EventID": 9130,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913101,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6315
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913102
-      ]
-    },
-    {
-      "ID": 913102,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 140,
-      "LanID": [
-        6316
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913103
-      ]
-    },
-    {
-      "ID": 913103,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6317
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 2,
-      "optionPara1": [
-        4013
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        913104,
-        101
-      ]
-    },
-    {
-      "ID": 913104,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 140,
-      "LanID": [
-        6318
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913105
-      ]
-    },
-    {
-      "ID": 913105,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        6319
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913106
-      ]
-    },
-    {
-      "ID": 913106,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6320
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913107
-      ]
-    },
-    {
-      "ID": 913107,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6321
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913108
-      ]
-    },
-    {
-      "ID": 913108,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6322
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913109
-      ]
-    },
-    {
-      "ID": 913109,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 135,
-      "LanID": [
-        6323
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913110
-      ]
-    },
-    {
-      "ID": 913110,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6324
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913111
-      ]
-    },
-    {
-      "ID": 913111,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6325
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913112
-      ]
-    },
-    {
-      "ID": 913112,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6326
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913113
-      ]
-    },
-    {
-      "ID": 913113,
-      "conciseEventMessage": 6314,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 139,
-      "LanID": [
-        6327
-      ],
-      "DialogueType": 0,
-      "EventID": 9131,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913201,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6329
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913202
-      ]
-    },
-    {
-      "ID": 913202,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6330
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913203
-      ]
-    },
-    {
-      "ID": 913203,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6331
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 1,
-      "optionPara1": [
-        913204,
-        913205
-      ],
-      "optionPara2": [
-        6332,
-        6333
-      ],
-      "ResultType": 1,
-      "ResultOptions": [
-        913204
-      ]
-    },
-    {
-      "ID": 913204,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6334
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 1,
-      "optionPara1": [
-        913206
-      ],
-      "optionPara2": [
-        6335
-      ],
-      "ResultType": 1,
-      "ResultOptions": [
-        913205
-      ]
-    },
-    {
-      "ID": 913205,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6336
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 1,
-      "optionPara1": [
-        913206
-      ],
-      "optionPara2": [
-        6337
-      ],
-      "ResultType": 1,
-      "ResultOptions": [
-        913206
-      ]
-    },
-    {
-      "ID": 913206,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 2,
-      "optionPara1": [
-        4014
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        913207,
-        101
-      ]
-    },
-    {
-      "ID": 913207,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6338
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913208
-      ]
-    },
-    {
-      "ID": 913208,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6339
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913209
-      ]
-    },
-    {
-      "ID": 913209,
-      "conciseEventMessage": 6328,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6340
-      ],
-      "DialogueType": 0,
-      "EventID": 9132,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913301,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6342
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913302
-      ]
-    },
-    {
-      "ID": 913302,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6343
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913303
-      ]
-    },
-    {
-      "ID": 913303,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6344
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913304
-      ]
-    },
-    {
-      "ID": 913304,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        6345
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913305
-      ]
-    },
-    {
-      "ID": 913305,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6346
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913306
-      ]
-    },
-    {
-      "ID": 913306,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6347
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913307
-      ]
-    },
-    {
-      "ID": 913307,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6348
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913308
-      ]
-    },
-    {
-      "ID": 913308,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6349
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913309
-      ]
-    },
-    {
-      "ID": 913309,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6350
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913310
-      ]
-    },
-    {
-      "ID": 913310,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6351
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 2,
-      "optionPara1": [
-        4015
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        913311,
-        101
-      ]
-    },
-    {
-      "ID": 913311,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6352
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913312
-      ]
-    },
-    {
-      "ID": 913312,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6353
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913313
-      ]
-    },
-    {
-      "ID": 913313,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6354
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913314
-      ]
-    },
-    {
-      "ID": 913314,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6355
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913315
-      ]
-    },
-    {
-      "ID": 913315,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6356
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913316
-      ]
-    },
-    {
-      "ID": 913316,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6357
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913317
-      ]
-    },
-    {
-      "ID": 913317,
-      "conciseEventMessage": 6341,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6358
-      ],
-      "DialogueType": 0,
-      "EventID": 9133,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913401,
-      "conciseEventMessage": 6359,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6360
-      ],
-      "DialogueType": 0,
-      "EventID": 9134,
-      "optionType": 2,
-      "optionPara1": [
-        4016
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        913402,
-        101
-      ]
-    },
-    {
-      "ID": 913402,
-      "conciseEventMessage": 6359,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6361
-      ],
-      "DialogueType": 0,
-      "EventID": 9134,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913501,
-      "conciseEventMessage": 6362,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 142,
-      "LanID": [
-        6363
-      ],
-      "DialogueType": 0,
-      "EventID": 9135,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913502
-      ]
-    },
-    {
-      "ID": 913502,
-      "conciseEventMessage": 6362,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6364
-      ],
-      "DialogueType": 0,
-      "EventID": 9135,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913503
-      ]
-    },
-    {
-      "ID": 913503,
-      "conciseEventMessage": 6362,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 142,
-      "LanID": [
-        6365
-      ],
-      "DialogueType": 0,
-      "EventID": 9135,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913504
-      ]
-    },
-    {
-      "ID": 913504,
-      "conciseEventMessage": 6362,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6366
-      ],
-      "DialogueType": 0,
-      "EventID": 9135,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913505
-      ]
-    },
-    {
-      "ID": 913505,
-      "conciseEventMessage": 6362,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6367
-      ],
-      "DialogueType": 0,
-      "EventID": 9135,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913506
-      ]
-    },
-    {
-      "ID": 913506,
-      "conciseEventMessage": 6362,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 142,
-      "LanID": [
-        6368
-      ],
-      "DialogueType": 0,
-      "EventID": 9135,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913601,
-      "conciseEventMessage": 6369,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6370
-      ],
-      "DialogueType": 0,
-      "EventID": 9136,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913602
-      ]
-    },
-    {
-      "ID": 913602,
-      "conciseEventMessage": 6369,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6371
-      ],
-      "DialogueType": 0,
-      "EventID": 9136,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913603
-      ]
-    },
-    {
-      "ID": 913603,
-      "conciseEventMessage": 6369,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6372
-      ],
-      "DialogueType": 0,
-      "EventID": 9136,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913604
-      ]
-    },
-    {
-      "ID": 913604,
-      "conciseEventMessage": 6369,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6373
-      ],
-      "DialogueType": 0,
-      "EventID": 9136,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913605
-      ]
-    },
-    {
-      "ID": 913605,
-      "conciseEventMessage": 6369,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6374
-      ],
-      "DialogueType": 0,
-      "EventID": 9136,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913606
-      ]
-    },
-    {
-      "ID": 913606,
-      "conciseEventMessage": 6369,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6375
-      ],
-      "DialogueType": 0,
-      "EventID": 9136,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913607
-      ]
-    },
-    {
-      "ID": 913607,
-      "conciseEventMessage": 6369,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6376
-      ],
-      "DialogueType": 0,
-      "EventID": 9136,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913701,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6378
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913702,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6379
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913703
-      ]
-    },
-    {
-      "ID": 913703,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6380
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913704
-      ]
-    },
-    {
-      "ID": 913704,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6381
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913705
-      ]
-    },
-    {
-      "ID": 913705,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6382
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913706
-      ]
-    },
-    {
-      "ID": 913706,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6383
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913707
-      ]
-    },
-    {
-      "ID": 913707,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6384
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913708
-      ]
-    },
-    {
-      "ID": 913708,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6385
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913709
-      ]
-    },
-    {
-      "ID": 913709,
-      "conciseEventMessage": 6377,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 141,
-      "LanID": [
-        6386
-      ],
-      "DialogueType": 0,
-      "EventID": 9137,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913801,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6380
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 1,
-      "optionPara1": [
-        913802,
-        913803
-      ],
-      "optionPara2": [
-        6381,
-        6382
-      ],
-      "ResultType": 1,
-      "ResultOptions": [
-        913802
-      ]
-    },
-    {
-      "ID": 913802,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6383
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913805
-      ]
-    },
-    {
-      "ID": 913803,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6384
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913804
-      ]
-    },
-    {
-      "ID": 913804,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6385
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913805
-      ]
-    },
-    {
-      "ID": 913805,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6386
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 2,
-      "optionPara1": [
-        4017
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        913806,
-        101
-      ]
-    },
-    {
-      "ID": 913806,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6387
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913807
-      ]
-    },
-    {
-      "ID": 913807,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6388
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913808
-      ]
-    },
-    {
-      "ID": 913808,
-      "conciseEventMessage": 6379,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6389
-      ],
-      "DialogueType": 0,
-      "EventID": 9138,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 913901,
-      "conciseEventMessage": 6390,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 133,
-      "LanID": [
-        6391
-      ],
-      "DialogueType": 0,
-      "EventID": 9139,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        913902
-      ]
-    },
-    {
-      "ID": 913902,
-      "conciseEventMessage": 6390,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6392
-      ],
-      "DialogueType": 0,
-      "EventID": 9139,
-      "optionType": 2,
-      "optionPara1": [
-        4018
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        913903,
-        101
-      ]
-    },
-    {
-      "ID": 914001,
-      "conciseEventMessage": 6393,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 143,
-      "LanID": [
-        6394
-      ],
-      "DialogueType": 0,
-      "EventID": 9140,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914002
-      ]
-    },
-    {
-      "ID": 914002,
-      "conciseEventMessage": 6393,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6395
-      ],
-      "DialogueType": 0,
-      "EventID": 9140,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914003
-      ]
-    },
-    {
-      "ID": 914003,
-      "conciseEventMessage": 6393,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 143,
-      "LanID": [
-        6396
-      ],
-      "DialogueType": 0,
-      "EventID": 9140,
-      "optionType": 1,
-      "optionPara1": [
-        913904,
-        913405
-      ],
-      "optionPara2": [
-        6397,
-        6398
-      ],
-      "ResultType": 1,
-      "ResultOptions": [
-        914004
-      ]
-    },
-    {
-      "ID": 914004,
-      "conciseEventMessage": 6393,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 143,
-      "LanID": [
-        6399
-      ],
-      "DialogueType": 0,
-      "EventID": 9140,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914005
-      ]
-    },
-    {
-      "ID": 914005,
-      "conciseEventMessage": 6393,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 143,
-      "LanID": [
-        6400
-      ],
-      "DialogueType": 0,
-      "EventID": 9140,
-      "ConditionId": [
-        47
-      ],
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 914101,
-      "conciseEventMessage": 6401,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 143,
-      "LanID": [
-        6402
-      ],
-      "DialogueType": 0,
-      "EventID": 9141,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914102
-      ]
-    },
-    {
-      "ID": 914102,
-      "conciseEventMessage": 6401,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6403
-      ],
-      "DialogueType": 0,
-      "EventID": 9141,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914103
-      ]
-    },
-    {
-      "ID": 914103,
-      "conciseEventMessage": 6401,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 143,
-      "LanID": [
-        6404
-      ],
-      "DialogueType": 0,
-      "EventID": 9141,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914104
-      ]
-    },
-    {
-      "ID": 914104,
-      "conciseEventMessage": 6401,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6405
-      ],
-      "DialogueType": 0,
-      "EventID": 9141,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914105
-      ]
-    },
-    {
-      "ID": 914105,
-      "conciseEventMessage": 6401,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 143,
-      "LanID": [
-        6406
-      ],
-      "DialogueType": 0,
-      "EventID": 9141,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914106
-      ]
-    },
-    {
-      "ID": 914106,
-      "conciseEventMessage": 6401,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6407
-      ],
-      "DialogueType": 0,
-      "EventID": 9141,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 914201,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6409
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914202
-      ]
-    },
-    {
-      "ID": 914202,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6410
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914203
-      ]
-    },
-    {
-      "ID": 914203,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6411
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914204
-      ]
-    },
-    {
-      "ID": 914204,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6412
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914205
-      ]
-    },
-    {
-      "ID": 914205,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6413
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914206
-      ]
-    },
-    {
-      "ID": 914206,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6414
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914207
-      ]
-    },
-    {
-      "ID": 914207,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6415
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914208
-      ]
-    },
-    {
-      "ID": 914208,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6416
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914209
-      ]
-    },
-    {
-      "ID": 914209,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6417
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914210
-      ]
-    },
-    {
-      "ID": 914210,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6418
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914211
-      ]
-    },
-    {
-      "ID": 914211,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6419
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914212
-      ]
-    },
-    {
-      "ID": 914212,
-      "conciseEventMessage": 6408,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6420
-      ],
-      "DialogueType": 0,
-      "EventID": 9142,
-      "ConditionId": [
-        48
-      ],
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 914301,
-      "conciseEventMessage": 6421,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6422
-      ],
-      "DialogueType": 0,
-      "EventID": 9143,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914302
-      ]
-    },
-    {
-      "ID": 914302,
-      "conciseEventMessage": 6421,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6423
-      ],
-      "DialogueType": 0,
-      "EventID": 9143,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914303
-      ]
-    },
-    {
-      "ID": 914303,
-      "conciseEventMessage": 6421,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6424
-      ],
-      "DialogueType": 0,
-      "EventID": 9143,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914304
-      ]
-    },
-    {
-      "ID": 914304,
-      "conciseEventMessage": 6421,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6425
-      ],
-      "DialogueType": 0,
-      "EventID": 9143,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 914401,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6427
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914402
-      ]
-    },
-    {
-      "ID": 914402,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6428
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914403
-      ]
-    },
-    {
-      "ID": 914403,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6429
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914404
-      ]
-    },
-    {
-      "ID": 914404,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6430
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914405
-      ]
-    },
-    {
-      "ID": 914405,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6431
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914406
-      ]
-    },
-    {
-      "ID": 914406,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 145,
-      "LanID": [
-        6432
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914407
-      ]
-    },
-    {
-      "ID": 914407,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6433
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914408
-      ]
-    },
-    {
-      "ID": 914408,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6434
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914409
-      ]
-    },
-    {
-      "ID": 914409,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 145,
-      "LanID": [
-        6435
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914410
-      ]
-    },
-    {
-      "ID": 914410,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6436
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 2,
-      "optionPara1": [
-        4019
-      ],
-      "ResultType": 2,
-      "ResultOptions": [
-        914411,
-        101
-      ]
-    },
-    {
-      "ID": 914411,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 145,
-      "LanID": [
-        6437
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914412
-      ]
-    },
-    {
-      "ID": 914412,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6438
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914413
-      ]
-    },
-    {
-      "ID": 914413,
-      "conciseEventMessage": 6426,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        6439
-      ],
-      "DialogueType": 0,
-      "EventID": 9144,
-      "optionType": 0,
-      "ResultType": 0
-    },
-    {
-      "ID": 914501,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6441
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914502
-      ]
-    },
-    {
-      "ID": 914502,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        6442
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914503
-      ]
-    },
-    {
-      "ID": 914503,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6443
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914504
-      ]
-    },
-    {
-      "ID": 914504,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6444
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914505
-      ]
-    },
-    {
-      "ID": 914505,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6445
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914506
-      ]
-    },
-    {
-      "ID": 914506,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6446
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914507
-      ]
-    },
-    {
-      "ID": 914507,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6447
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914508
-      ]
-    },
-    {
-      "ID": 914508,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6448
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914509
-      ]
-    },
-    {
-      "ID": 914509,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 144,
-      "LanID": [
-        6449
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914510
-      ]
-    },
-    {
-      "ID": 914510,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 131,
-      "LanID": [
-        6450
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914511
-      ]
-    },
-    {
-      "ID": 914511,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 100,
-      "LanID": [
-        6451
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        914512
-      ]
-    },
-    {
-      "ID": 914512,
-      "conciseEventMessage": 6440,
-      "EventConditionMessage": 0,
-      "PreShow": 0,
-      "PreShowPar": 0,
-      "NPCID": 0,
-      "LanID": [
-        6452
-      ],
-      "DialogueType": 0,
-      "EventID": 9145,
-      "optionType": 0,
-      "ResultType": 0
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -395,54 +395,6 @@
       "name": 2130,
       "icon": "bg_lh_huizi",
       "DaoyouID": 0
-    },
-    {
-      "ID": 138,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
-    },
-    {
-      "ID": 139,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
-    },
-    {
-      "ID": 140,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
-    },
-    {
-      "ID": 141,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
-    },
-    {
-      "ID": 142,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
-    },
-    {
-      "ID": 143,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
-    },
-    {
-      "ID": 144,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
-    },
-    {
-      "ID": 145,
-      "name": 0,
-      "icon": "",
-      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 4193,
@@ -38122,47 +38122,83 @@
     },
     {
       "ID": 10271,
-      "txt": "0"
+      "txt": "道友"
     },
     {
       "ID": 10272,
-      "txt": "0"
+      "txt": "人物介绍"
     },
     {
       "ID": 10273,
-      "txt": "0"
+      "txt": "逍遥宗弟子，宗门经常派其出门需要找药材"
     },
     {
       "ID": 10274,
-      "txt": "0"
+      "txt": "喜欢礼物"
     },
     {
       "ID": 10275,
-      "txt": "0"
+      "txt": "送玩家喜欢得物品好感度加得更多哟"
     },
     {
       "ID": 10276,
-      "txt": "0"
+      "txt": "道友送礼"
     },
     {
       "ID": 10277,
-      "txt": "0"
+      "txt": "礼物："
     },
     {
       "ID": 10278,
-      "txt": "0"
+      "txt": "送礼概率：{0}%"
     },
     {
       "ID": 10279,
-      "txt": "0"
+      "txt": "道友词缀"
     },
     {
       "ID": 10280,
-      "txt": "0"
+      "txt": "成为道侣后可为英雄带来加成"
     },
     {
       "ID": 10281,
-      "txt": "0"
+      "txt": "基础信息"
+    },
+    {
+      "ID": 10282,
+      "txt": "好感度"
+    },
+    {
+      "ID": 10283,
+      "txt": "送礼"
+    },
+    {
+      "ID": 10284,
+      "txt": "通用"
+    },
+    {
+      "ID": 10285,
+      "txt": "喜爱"
+    },
+    {
+      "ID": 10286,
+      "txt": "当前选择数量"
+    },
+    {
+      "ID": 10287,
+      "txt": "取消"
+    },
+    {
+      "ID": 10288,
+      "txt": "确认赠送"
+    },
+    {
+      "ID": 10289,
+      "txt": "好感度+{0} ({1} - {2})"
+    },
+    {
+      "ID": 10290,
+      "txt": "心情+{0} "
     }
   ]
 }

Assets/Res/Config/PlayerGuideConfig.json

@@ -116,7 +116,7 @@
       "FingerType": 1,
       "dialogPos": [
         -182,
-        -517
+        -564
       ],
       "NpcPos": [
         422,
@@ -130,8 +130,8 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10134,
-      "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "Highlighting": 0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -167,7 +167,7 @@
       "SpeakerImage": 3,
       "desc": 10135,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -203,7 +203,7 @@
       "SpeakerImage": 3,
       "desc": 10136,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -223,8 +223,8 @@
       "groupID": 2,
       "FingerType": -1,
       "dialogPos": [
-        -234,
-        -114
+        -180,
+        357
       ],
       "NpcPos": [
         422,
@@ -239,7 +239,7 @@
       "SpeakerImage": 3,
       "desc": 10137,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -275,7 +275,7 @@
       "SpeakerImage": 3,
       "desc": 10138,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -295,8 +295,8 @@
       "groupID": 2,
       "FingerType": 1,
       "dialogPos": [
-        -125,
-        -100
+        -43,
+        451
       ],
       "NpcPos": [
         422,
@@ -311,7 +311,7 @@
       "SpeakerImage": 3,
       "desc": 10139,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -347,7 +347,7 @@
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.55,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -490,7 +490,7 @@
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
       "desc": 10142,
-      "Highlighting": 1,
+      "Highlighting": 0,
       "blackAlpha": 0.55,
       "Handle": 1,
       "IsSkip": 0,

Assets/Res/Config/SmallPlacesConfig.json

@@ -5,80 +5,70 @@
       "placeName": 10037,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10001,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": 10001
     },
     {
       "ID": 2,
       "placeName": 10038,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10004,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": 10004
     },
     {
       "ID": 3,
       "placeName": 10039,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10009,
-      "sceneName": "LevelBattle01"
+      "UnlockEnvetid": 10009
     },
     {
       "ID": 4,
       "placeName": 10040,
       "PlacesId": 1,
       "CompletionEventCount": 5,
-      "UnlockEnvetid": 10012,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": 10012
     },
     {
       "ID": 5,
       "placeName": 10041,
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10013,
-      "sceneName": "LevelBattle03"
+      "UnlockEnvetid": 10013
     },
     {
       "ID": 6,
       "placeName": 10042,
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10018,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": 10018
     },
     {
       "ID": 7,
       "placeName": 10043,
       "PlacesId": 2,
       "CompletionEventCount": 5,
-      "UnlockEnvetid": 10022,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": 10022
     },
     {
       "ID": 8,
       "placeName": 10044,
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10025,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": 10025
     },
     {
       "ID": 9,
       "placeName": 10045,
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10028,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": 10028
     },
     {
       "ID": 10,
       "placeName": 10046,
       "PlacesId": 3,
       "CompletionEventCount": -1,
-      "UnlockEnvetid": -1,
-      "sceneName": "LevelBattle02"
+      "UnlockEnvetid": -1
     }
   ]
 }

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1322,6 +1322,7 @@ GameObject:
   - component: {fileID: 7738688835941902387}
   - component: {fileID: 6349483430262066545}
   - component: {fileID: 3321649198259807000}
+  - component: {fileID: 2702576148297842824}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1391,6 +1392,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9053\u53CB\u8BCD\u7F00"
+--- !u!114 &2702576148297842824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1025812169740066445}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10279
 --- !u!1 &1345709599746255313
 GameObject:
   m_ObjectHideFlags: 0
@@ -1403,6 +1417,7 @@ GameObject:
   - component: {fileID: 317847437290910258}
   - component: {fileID: 4425279744413250104}
   - component: {fileID: 2285448709473073041}
+  - component: {fileID: 2239824695928315850}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1487,6 +1502,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.50980395, g: 0.227451, b: 0.19607845, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &2239824695928315850
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1345709599746255313}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10288
 --- !u!1 &1356558698788162097
 GameObject:
   m_ObjectHideFlags: 0
@@ -1499,6 +1527,7 @@ GameObject:
   - component: {fileID: 3824376010802004137}
   - component: {fileID: 543747501464923614}
   - component: {fileID: 6098075878340785976}
+  - component: {fileID: 8282778513491759403}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -1583,6 +1612,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.31764707, g: 0.42352945, b: 0.42352945, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &8282778513491759403
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1356558698788162097}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10281
 --- !u!1 &1360099998295074952
 GameObject:
   m_ObjectHideFlags: 0
@@ -1695,6 +1737,140 @@ MonoBehaviour:
   - {fileID: 2526063596812524126}
   - {fileID: 7803027041493617024}
   _allChildObj: []
+--- !u!1 &1478603707727383865
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3725166726512187243}
+  - component: {fileID: 1915465128249695308}
+  - component: {fileID: 1473205901809273692}
+  - component: {fileID: 7545103312125652186}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Slider_Emotion
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3725166726512187243
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1478603707727383865}
+  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: 3191291446307660072}
+  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: 108, y: 94}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1915465128249695308
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1478603707727383865}
+  m_CullTransparentMesh: 1
+--- !u!114 &1473205901809273692
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1478603707727383865}
+  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.9607844, g: 0.62352943, b: 0.62352943, 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: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 0.563
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_taoxin_bai
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
+  packInfo:
+    packName: daoyou
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
+    lasetJsonGUID: 517694f57c52fa25fbf5a38ef253f2b4
+  imageH: 76.70108
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &7545103312125652186
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1478603707727383865}
+  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: 1473205901809273692}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1619831852745943432
 GameObject:
   m_ObjectHideFlags: 0
@@ -2488,6 +2664,7 @@ GameObject:
   - component: {fileID: 2656559439721035028}
   - component: {fileID: 8138911261377067367}
   - component: {fileID: 851556366484024009}
+  - component: {fileID: 7309538993311187913}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2572,6 +2749,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.30980393, g: 0.41960788, b: 0.41960788, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7309538993311187913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2069182741677477852}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10282
 --- !u!1 &2337485120667169640
 GameObject:
   m_ObjectHideFlags: 0
@@ -2583,6 +2773,7 @@ GameObject:
   - component: {fileID: 1841211574166055732}
   - component: {fileID: 5260370336827037512}
   - component: {fileID: 1300453175743296251}
+  - component: {fileID: 3448716094321876748}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2652,6 +2843,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u559C\u6B22\u793C\u7269"
+--- !u!114 &3448716094321876748
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2337485120667169640}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10274
 --- !u!1 &2416909971864168913
 GameObject:
   m_ObjectHideFlags: 0
@@ -2767,6 +2971,7 @@ GameObject:
   - component: {fileID: 3556569205783330970}
   - component: {fileID: 4125139517950329887}
   - component: {fileID: 5344696876232748914}
+  - component: {fileID: 4178572551010760513}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Desc (1)
@@ -2836,6 +3041,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9001\u73A9\u5BB6\u559C\u6B22\u5F97\u7269\u54C1\u597D\u611F\u5EA6\u52A0\u5F97\u66F4\u591A\u54DF"
+--- !u!114 &4178572551010760513
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2418192199851767487}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10275
 --- !u!1 &2569258318932287243
 GameObject:
   m_ObjectHideFlags: 0
@@ -3390,6 +3608,7 @@ GameObject:
   - component: {fileID: 266532094625287817}
   - component: {fileID: 8461724369163925533}
   - component: {fileID: 6855074718318253705}
+  - component: {fileID: 3046998691570472003}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Desc (3)
@@ -3459,6 +3678,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6210\u4E3A\u9053\u4FA3\u540E\u53EF\u4E3A\u82F1\u96C4\u5E26\u6765\u52A0\u6210"
+--- !u!114 &3046998691570472003
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3269525500137286496}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10280
 --- !u!1 &3331127102957262846
 GameObject:
   m_ObjectHideFlags: 0
@@ -3653,6 +3885,7 @@ GameObject:
   - component: {fileID: 4245080092102041178}
   - component: {fileID: 9081333137781023532}
   - component: {fileID: 6471816487337384604}
+  - component: {fileID: 9198611142698174460}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -3737,6 +3970,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.6156863, g: 0.37254903, b: 0.37254903, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &9198611142698174460
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3366775719051348093}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10283
 --- !u!1 &3476177314762847274
 GameObject:
   m_ObjectHideFlags: 0
@@ -4162,13 +4408,14 @@ 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: 3725166726512187243}
   m_Father: {fileID: 5372183047762724418}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 37.5, y: -415}
-  m_SizeDelta: {x: 82.4885, y: 73.1502}
+  m_AnchoredPosition: {x: 27.4, y: -406.5}
+  m_SizeDelta: {x: 112, y: 98}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &701284727440214038
 CanvasRenderer:
@@ -4208,7 +4455,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_xingxiang_taoxin
+  _icon_name: dec_taoxin
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
@@ -5642,6 +5889,7 @@ GameObject:
   - component: {fileID: 5034273891096479125}
   - component: {fileID: 72541127953416478}
   - component: {fileID: 3178488268557796038}
+  - component: {fileID: 1657849028173825700}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -5711,6 +5959,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4EBA\u7269\u4ECB\u7ECD"
+--- !u!114 &1657849028173825700
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5099322193779763339}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10272
 --- !u!1 &5123228744844620583
 GameObject:
   m_ObjectHideFlags: 0
@@ -5802,6 +6063,7 @@ GameObject:
   - component: {fileID: 8003759286189195980}
   - component: {fileID: 5310920071325626268}
   - component: {fileID: 7978947308348971444}
+  - component: {fileID: 4860207801093470897}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Desc (3)
@@ -5871,6 +6133,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u793C\u7269\uFF1A"
+--- !u!114 &4860207801093470897
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5276004169157575716}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10277
 --- !u!1 &5355757888606201826
 GameObject:
   m_ObjectHideFlags: 0
@@ -5882,6 +6157,7 @@ GameObject:
   - component: {fileID: 1806056072333165247}
   - component: {fileID: 1914762879210721142}
   - component: {fileID: 489961739108058375}
+  - component: {fileID: 8738451579955004867}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -5951,6 +6227,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9053\u53CB\u9001\u793C"
+--- !u!114 &8738451579955004867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5355757888606201826}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10276
 --- !u!1 &5432237188488368165
 GameObject:
   m_ObjectHideFlags: 0
@@ -8980,6 +9269,7 @@ GameObject:
   - component: {fileID: 4153655248723165311}
   - component: {fileID: 1824831189047131080}
   - component: {fileID: 6200574550103648133}
+  - component: {fileID: 5809096776200699054}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -9064,6 +9354,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.6, g: 0.23529413, b: 0.23137257, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &5809096776200699054
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8493669954259296856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10287
 --- !u!1 &8549242388435890262
 GameObject:
   m_ObjectHideFlags: 0
@@ -9726,6 +10029,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Slider_Emotion
+    gameObject: {fileID: 1473205901809273692}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &2591569182256414571
 PrefabInstance:
@@ -9854,7 +10162,10 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7122322602923147193}
   m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
 --- !u!224 &3218994791392146580 stripped
 RectTransform:
@@ -9883,6 +10194,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &8136657172439274137 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 2591569182256414571}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7122322602923147193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8136657172439274137}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10285
 --- !u!1001 &7831918929588972725
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9994,7 +10323,10 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7229560811392817164}
   m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
 --- !u!114 &2036565602186309336 stripped
 MonoBehaviour:
@@ -10018,6 +10350,24 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &4588248979070796103 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5988710972483612146, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 7831918929588972725}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7229560811392817164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4588248979070796103}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10284
 --- !u!224 &7200024353796400970 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}

Assets/Res/UI/DaoYouPanel/DaoYouPanel.prefab

@@ -279,6 +279,7 @@ GameObject:
   - component: {fileID: 8532944055590825543}
   - component: {fileID: 2455864051919483882}
   - component: {fileID: 6712363140131920105}
+  - component: {fileID: 897025699886414178}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -363,6 +364,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.43137258, g: 0.70980394, b: 0.6745098, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &897025699886414178
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 952350175352855096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10271
 --- !u!1 &982856282458991713
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DaoYouPanel/DaoYouWidget.prefab

@@ -519,6 +519,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Slider_Emotion
+    gameObject: {fileID: 4242738042045134088}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &4309724099149842934
 MonoBehaviour:
@@ -1089,13 +1094,14 @@ 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: 8661795095469256590}
   m_Father: {fileID: 5070300881352391495}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 6.100006, y: 3.9680023}
-  m_SizeDelta: {x: 53, y: 47}
+  m_AnchoredPosition: {x: 6.1003, y: 6.7533}
+  m_SizeDelta: {x: 51.8856, y: 45.3999}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &6786146373864765451
 CanvasRenderer:
@@ -1135,7 +1141,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_daoyou_xingxiang_taoxin
+  _icon_name: dec_taoxin
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
   packInfo:
@@ -1237,3 +1243,92 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7980571675409530362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8661795095469256590}
+  - component: {fileID: 3313608551637651139}
+  - component: {fileID: 4242738042045134088}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Slider_Emotion
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8661795095469256590
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7980571675409530362}
+  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: 5414614616448102811}
+  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.000009536743, y: 0}
+  m_SizeDelta: {x: 50.4809, y: 43.9371}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3313608551637651139
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7980571675409530362}
+  m_CullTransparentMesh: 1
+--- !u!114 &4242738042045134088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7980571675409530362}
+  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.9607844, g: 0.627451, b: 0.627451, 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: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_taoxin_bai
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 0d383e80d99516a44a603bb1ccd73209, type: 3}
+  packInfo:
+    packName: daoyou
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoyou.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoyou.spriteatlasv2
+    lasetJsonGUID: 517694f57c52fa25fbf5a38ef253f2b4
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

Assets/Res/UIAtlas/daoyou.spriteatlasv2

@@ -33,6 +33,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 7be1ebce8bb60e449925cb98417f2869, type: 3}
     - {fileID: 2800000, guid: bcc9fc139ef095046b682188ab4f1a56, type: 3}
     - {fileID: 2800000, guid: 02a732c03a39407478a6ca7dfa4a9d56, type: 3}
+    - {fileID: 2800000, guid: fd3427389adcc1649b3052e4ee4aad7c, type: 3}
     - {fileID: 2800000, guid: e9596307895e7b44bb12b263c4e8cb93, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -129,6 +129,8 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 43ee7ca9b6e77b041a5a5c40598a7267, type: 3}
     - {fileID: 2800000, guid: 2d2e9b702b9dc20418741c36f06c90b5, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
+    - {fileID: 2800000, guid: 771183074c65e95498415e16fe987c8b, type: 3}
+    - {fileID: 2800000, guid: 01e2f146052dd844fb8db9bab92b4512, type: 3}
     - {fileID: 2800000, guid: 1064e5697afcf2e4380fce9ef6f3716c, type: 3}
     - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}

Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

@@ -64,16 +64,6 @@ namespace Excel2Json
 #endif
 		
 
-		/// <summary>
-		///
-		/// </summary>
-#if !COMBAT_SERVER
-		public string sceneName;
-#else
-		public string sceneName{ set; get; }
-#endif
-		
-
 	}
 
 }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -92,7 +92,8 @@ namespace Fort23.Mono
                     && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
                     && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
                 {
-                    AccountFileInfo.EventList eventList = EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
+                    AccountFileInfo.EventList eventList =
+                        EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);
                     AccountFileInfo.Instance.playerData.eventList.Add(eventList);
                     AccountFileInfo.Instance.SavePlayerData();
                     EventSystemManager.Instance.TriggerEvent(eventList);
@@ -138,7 +139,8 @@ namespace Fort23.Mono
 
                     emotionConfig emotionConfig = ConfigComponent.Instance.Get<emotionConfig>(daoYouData.emotion);
 
-                    if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID) && !daoYouData.loveIds.Contains(daoyouGiftConfig.ItemID))
+                    if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID) &&
+                        !daoYouData.loveIds.Contains(daoyouGiftConfig.ItemID))
                     {
                         daoYouData.loveIds.Add(daoyouGiftConfig.ItemID);
                     }
@@ -258,7 +260,10 @@ namespace Fort23.Mono
                 Btn_Eveent.gameObject.SetActive(false);
             }
 
-            HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(PlayerManager.Instance.GetDaoYouLevel(daoYouData));
+            Slider_Emotion.fillAmount = daoYouData.emotionValue / 100;
+
+            HeroPowerUpConfig heroPowerUpConfig =
+                ConfigComponent.Instance.Get<HeroPowerUpConfig>(PlayerManager.Instance.GetDaoYouLevel(daoYouData));
             Text_JingJie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
@@ -278,16 +283,20 @@ namespace Fort23.Mono
 
             // guajibuff guajibuff = ConfigComponent.Instance.Get<guajibuff>(_daoyouModelConfig.guajiBuffID[0]);
             // DaoyouLevelupConfig daoyouLevelupConfig1 = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
-            Text_GiftGailv.text = "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
+            Text_GiftGailv.text = LanguageManager.Instance.Text(10278,
+                PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]));
+                // "送礼概率:" + PlayerManager.Instance.GetBl(daoYouData, _daoyouModelConfig.guajiBuffID[0]) + "%";
             for (var i = 1; i < _daoyouModelConfig.guajiBuffID.Length; i++)
             {
-                DaoYouIdleEarningsWidget daoYouIdleEarningsWidget = await UIManager.Instance.CreateGComponent<DaoYouIdleEarningsWidget>(null, GuajiContent);
+                DaoYouIdleEarningsWidget daoYouIdleEarningsWidget =
+                    await UIManager.Instance.CreateGComponent<DaoYouIdleEarningsWidget>(null, GuajiContent);
                 daoYouIdleEarningsWidget.CustomInit(daoYouData, _daoyouModelConfig.guajiBuffID[i]);
                 _daoYouIdleEarningsWidgets.Add(daoYouIdleEarningsWidget);
             }
 
 
-            DaoyouLevelupConfig currentDaoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
+            DaoyouLevelupConfig currentDaoyouLevelupConfig =
+                ConfigComponent.Instance.Get<DaoyouLevelupConfig>(daoYouData.favorabilityLv);
             Text_CurrentName.text = LanguageManager.Instance.Text(currentDaoyouLevelupConfig.name);
             Text_CurrentLevel.text = daoYouData.favorabilityLv.ToString();
             Slider_LeveUp.maxValue = currentDaoyouLevelupConfig.exp;
@@ -298,9 +307,11 @@ namespace Fort23.Mono
             {
                 foreach (var i in _daoyouModelConfig.PreferGiftID)
                 {
-                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
+                    WidgetItem widgetItem =
+                        await UIManager.Instance.CreateGComponent<WidgetItem>(null, LoveItemContent);
                     widgetItems.Add(widgetItem);
-                    if (_daoyouModelConfig.shownPreferGiftID.Contains(i) || (daoYouData != null && daoYouData.loveIds.Contains(i)))
+                    if (_daoyouModelConfig.shownPreferGiftID.Contains(i) ||
+                        (daoYouData != null && daoYouData.loveIds.Contains(i)))
                     {
                         widgetItem.InitWidget(new ItemInfo(i, 0));
                     }
@@ -315,7 +326,8 @@ namespace Fort23.Mono
             {
                 foreach (var i in _daoyouModelConfig.daolvSkillID)
                 {
-                    DaoYouaaFfixWidget daoYouaaFfixWidge = await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent);
+                    DaoYouaaFfixWidget daoYouaaFfixWidge =
+                        await UIManager.Instance.CreateGComponent<DaoYouaaFfixWidget>(null, DaoLvContent);
                     daoYouaaFfixWidge.CustomInit(i);
                     daoYouaaFfixWidgets.Add(daoYouaaFfixWidge);
                 }
@@ -325,7 +337,8 @@ namespace Fort23.Mono
             DaoyouLevelupConfig[] configs = ConfigComponent.Instance.GetAll<DaoyouLevelupConfig>();
             foreach (var daoyouLevelupConfig in configs)
             {
-                DaoYouLevelWidget daoYouLevelWidget = await UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent);
+                DaoYouLevelWidget daoYouLevelWidget =
+                    await UIManager.Instance.CreateGComponent<DaoYouLevelWidget>(null, DaoYouLevelWidgetContent);
                 daoYouLevelWidget.CustomInit(daoYouData, daoyouLevelupConfig.ID);
                 _daoYouLevelWidgets.Add(daoYouLevelWidget);
             }
@@ -374,7 +387,8 @@ namespace Fort23.Mono
             {
                 foreach (var itemInfo in allItems)
                 {
-                    if (_daoyouModelConfig.shownPreferGiftID.Contains(itemInfo.itemID) || (daoYouData != null && daoYouData.loveIds.Contains(itemInfo.itemID)))
+                    if (_daoyouModelConfig.shownPreferGiftID.Contains(itemInfo.itemID) ||
+                        (daoYouData != null && daoYouData.loveIds.Contains(itemInfo.itemID)))
                     {
                         shownItems.Add(itemInfo);
                     }
@@ -466,11 +480,14 @@ namespace Fort23.Mono
             Text_Count.text = $"当前选择数量{count}";
             if (widgetItem1 != null && daoyouGiftConfig.ID != 0)
             {
-                Text_GiveGiftDesc.text = $"好感度+{daoyouGiftConfig.emotionValue} ({daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[0] * 0.001} - {daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[1] * 0.001})";
+                Text_GiveGiftDesc.text = LanguageManager.Instance.Text(10289, daoyouGiftConfig.emotionValue,
+                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[0] * 0.001,
+                    daoyouGiftConfig.emotionValue * emotionConfig.hanganUpRate[1] * 0.001);
             }
             else if (widgetItem1 != null && daoyouGiftConfig.ID == 0)
             {
-                Text_GiveGiftDesc.text = $"心情+{widgetItem1.itemInfo.config.associateVlaue[0]} )";
+                Text_GiveGiftDesc.text =
+                    LanguageManager.Instance.Text(10290, widgetItem1.itemInfo.config.associateVlaue[0]);
             }
         }
 

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanelData.cs

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

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -45,6 +45,15 @@ namespace Fort23.Mono
                 Text_Level.text = 0 + "";
             }
 
+            if (_daoYouData == null)
+            {
+                Slider_Emotion.fillAmount = 1;
+            }
+            else
+            {
+                Slider_Emotion.fillAmount = _daoYouData.emotionValue / 100;
+            }
+           
 
             if (_daoYouData == null)
             {

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidgetData.cs

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