Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab   resolved by master version

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

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WykYs3j5UXOCqE5E5Nu1dSMnfNclRlWQMHntt7b1KI+vtsN4DlWnfpf0Wj9c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/cs3.scene

@@ -105352,7 +105352,7 @@ Mesh:
       format: 0
       dimension: 0
     m_DataSize: 128
-    _typelessdata: 07071fbb0100c0be5be4fcbb0000008000000080000080bf000000000000000007071f3b0100c0be5be4fcbb0000008000000080000080bf0000803f0000000007071fbbceccccbc5be4fcbb0000008000000080000080bf000000000000803f07071f3bceccccbc5be4fcbb0000008000000080000080bf0000803f0000803f
+    _typelessdata: eb6127bb0100c0be239b05bc0000008000000080000080bf0000000000000000eb61273b0100c0be239b05bc0000008000000080000080bf0000803f00000000eb6127bbceccccbc239b05bc0000008000000080000080bf000000000000803feb61273bceccccbc239b05bc0000008000000080000080bf0000803f0000803f
   m_CompressedMesh:
     m_Vertices:
       m_NumItems: 0
@@ -146667,22 +146667,10 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 305698642}
-    - target: {fileID: 1731587295771662961, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 262
-      objectReference: {fileID: 0}
-    - target: {fileID: 1731587295771662961, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -14
-      objectReference: {fileID: 0}
     - target: {fileID: 1740163407950700331, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 2122457263}
-    - target: {fileID: 1788309816096862246, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 210
-      objectReference: {fileID: 0}
     - target: {fileID: 1792393496435462086, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -146699,10 +146687,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1747513810}
-    - target: {fileID: 2147289544372904116, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2154747060771161352, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -146731,6 +146715,10 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1893332526}
+    - target: {fileID: 3075876678496543235, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 668358966}
     - target: {fileID: 3512225271664783798, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_SizeDelta.x
       value: 0
@@ -146781,7 +146769,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4560208317817494006, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -95.28037
+      value: -94.89583
       objectReference: {fileID: 0}
     - target: {fileID: 4626524454384784257, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Sprite
@@ -146807,14 +146795,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 146522765}
-    - target: {fileID: 5720882546850458775, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 0b2b6fa156e4ba84fa1db191d7765dc3, type: 3}
-    - target: {fileID: 5720882546850458775, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: _icon_name
-      value: bg_lh_queyinger
-      objectReference: {fileID: 0}
     - target: {fileID: 5827906740719855057, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -146831,10 +146811,6 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 1441643783}
-    - target: {fileID: 6372931879222497873, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 6437158370280986459, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -146859,14 +146835,6 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7861361364591785620, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7861361364591785620, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7923123621773473919, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Sprite
       value: 
@@ -146883,14 +146851,14 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 177617212}
-    - target: {fileID: 8676919068778418201, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 8994874510214016950, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Name
       value: DaoYouInfoPanel
       objectReference: {fileID: 0}
+    - target: {fileID: 8994874510214016950, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 9037135992368401232, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -146921,7 +146889,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9037135992368401232, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 1622.6636
+      value: 1541.6666
       objectReference: {fileID: 0}
     - target: {fileID: 9037135992368401232, guid: 5f65cb0190eeba3498d8500706733775, type: 3}
       propertyPath: m_LocalPosition.x
@@ -189800,6 +189768,221 @@ Transform:
   - {fileID: 579050185}
   m_Father: {fileID: 69376031}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!213 &668358966
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_juxing_fang(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 100
+    height: 100
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 50, y: 50, z: 50, w: 50}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    02b70e3a04ca73d43b1c980bb9b7c829: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: 02b70e3a04ca73d43b1c980bb9b7c829, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 000000bf0000003f000000000000003f000000bf000000000000003f0000003f00000000000000bf000000bf000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 100
+      height: 100
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 50, z: 100, w: 50}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 000000bf0000003f000000000000003f000000bf000000000000003f0000003f00000000000000bf000000bf000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 1736
+      y: 815
+      width: 100
+      height: 100
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 1736, y: 815}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 1786, z: 100, w: 865}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: -0.5, y: 0.5}
+    - {x: -0.5, y: -0.5}
+    - {x: 0.5, y: -0.5}
+    - {x: 0.5, y: 0.5}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &668439537
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/Config/SentimentEffectConfig.json

@@ -128,7 +128,7 @@
       "massge": 3141,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 11,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         2
@@ -145,7 +145,7 @@
       "massge": 10520,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 21,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         3
@@ -162,7 +162,7 @@
       "massge": 10521,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 31,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         4
@@ -179,7 +179,7 @@
       "massge": 10522,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 41,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         5
@@ -196,7 +196,7 @@
       "massge": 10523,
       "pos": 1,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 51,
+      "unlockLevel": 0,
       "effectType": 1,
       "effectVale": [
         6
@@ -213,7 +213,7 @@
       "massge": 3142,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 11,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         2
@@ -230,7 +230,7 @@
       "massge": 10524,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 21,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         3
@@ -247,7 +247,7 @@
       "massge": 10525,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 31,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         4
@@ -264,7 +264,7 @@
       "massge": 10526,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 41,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         5
@@ -281,7 +281,7 @@
       "massge": 10527,
       "pos": 2,
       "lastSentimentEffectId": 1,
-      "unlockLevel": 51,
+      "unlockLevel": 1,
       "effectType": 6,
       "effectVale": [
         6
@@ -298,7 +298,7 @@
       "massge": 3143,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 11,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         2
@@ -315,7 +315,7 @@
       "massge": 10528,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 21,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         3
@@ -332,7 +332,7 @@
       "massge": 10529,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 31,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         4
@@ -349,7 +349,7 @@
       "massge": 10530,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 41,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         5
@@ -366,7 +366,7 @@
       "massge": 10531,
       "pos": 3,
       "lastSentimentEffectId": -1,
-      "unlockLevel": 51,
+      "unlockLevel": 0,
       "effectType": 7,
       "effectVale": [
         6
@@ -383,7 +383,7 @@
       "massge": 3144,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 31,
+      "unlockLevel": 1,
       "effectType": 5,
       "effectVale": [
         106,
@@ -401,7 +401,7 @@
       "massge": 10532,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 41,
+      "unlockLevel": 2,
       "effectType": 5,
       "effectVale": [
         106,
@@ -419,7 +419,7 @@
       "massge": 10533,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 51,
+      "unlockLevel": 3,
       "effectType": 5,
       "effectVale": [
         106,
@@ -437,7 +437,7 @@
       "massge": 10534,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 61,
+      "unlockLevel": 4,
       "effectType": 5,
       "effectVale": [
         106,
@@ -455,7 +455,7 @@
       "massge": 10535,
       "pos": 4,
       "lastSentimentEffectId": 111,
-      "unlockLevel": 71,
+      "unlockLevel": 5,
       "effectType": 5,
       "effectVale": [
         106,
@@ -473,7 +473,7 @@
       "massge": 3145,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 31,
+      "unlockLevel": 1,
       "effectType": 8,
       "effectVale": [
         2
@@ -490,7 +490,7 @@
       "massge": 10536,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 41,
+      "unlockLevel": 2,
       "effectType": 8,
       "effectVale": [
         3
@@ -507,7 +507,7 @@
       "massge": 10537,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 51,
+      "unlockLevel": 3,
       "effectType": 8,
       "effectVale": [
         4
@@ -524,7 +524,7 @@
       "massge": 10538,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 61,
+      "unlockLevel": 4,
       "effectType": 8,
       "effectVale": [
         5
@@ -541,7 +541,7 @@
       "massge": 10539,
       "pos": 5,
       "lastSentimentEffectId": 112,
-      "unlockLevel": 71,
+      "unlockLevel": 5,
       "effectType": 8,
       "effectVale": [
         6
@@ -558,7 +558,7 @@
       "massge": 3146,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 51,
+      "unlockLevel": 1,
       "effectType": 9,
       "effectVale": [
         2,
@@ -576,7 +576,7 @@
       "massge": 10540,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 61,
+      "unlockLevel": 2,
       "effectType": 9,
       "effectVale": [
         3,
@@ -594,7 +594,7 @@
       "massge": 10541,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 71,
+      "unlockLevel": 3,
       "effectType": 9,
       "effectVale": [
         4,
@@ -612,7 +612,7 @@
       "massge": 10542,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 81,
+      "unlockLevel": 4,
       "effectType": 9,
       "effectVale": [
         5,
@@ -630,7 +630,7 @@
       "massge": 10543,
       "pos": 8,
       "lastSentimentEffectId": 115,
-      "unlockLevel": 91,
+      "unlockLevel": 5,
       "effectType": 9,
       "effectVale": [
         6,

Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -35,6 +35,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 48bc9ebf2521a0e4ba05629c238ff562, type: 3}
     - {fileID: 2800000, guid: 8d23bd6df991bc6409f6b98f584e7296, type: 3}
     - {fileID: 2800000, guid: 9b116a8b642a3c04298780f10d94e7fe, type: 3}
+    - {fileID: 2800000, guid: dc76bd286982c8a448cc80245cd64b31, type: 3}
     - {fileID: 2800000, guid: da985347d9c869e43affe58a0528f584, type: 3}
     - {fileID: 2800000, guid: a5ccafc312c87454980e5ecb377412c2, type: 3}
     - {fileID: 2800000, guid: a8adb5f9798a7a34eae5b6fcd60714e5, type: 3}