lzx 1 dag sedan
förälder
incheckning
b66b668d50
76 ändrade filer med 3304 tillägg och 457 borttagningar
  1. BIN
      Assets/Art/UIAssets/Button/btn_xiulianDanyao.png
  2. BIN
      Assets/Art/UIAssets/Button/btn_xiulianDujie.png
  3. BIN
      Assets/Art/UIAssets/Button/btn_xiulianTupo.png
  4. 0 0
      Assets/Art/UIAssets/TextrueJson/bg.txt
  5. 0 0
      Assets/Art/UIAssets/TextrueJson/jingjie.txt
  6. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  7. BIN
      Assets/Art/UIAssets/bg/bg_dongfu2.png
  8. 203 0
      Assets/Art/UIAssets/bg/bg_dongfu2.png.meta
  9. BIN
      Assets/Art/UIAssets/bg/bg_xiulian.png
  10. BIN
      Assets/Art/UIAssets/decorate/dec_dikuang_db.png
  11. 203 0
      Assets/Art/UIAssets/decorate/dec_dikuang_db.png.meta
  12. BIN
      Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png
  13. 203 0
      Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png.meta
  14. BIN
      Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png
  15. 203 0
      Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png.meta
  16. BIN
      Assets/Art/UIAssets/decorate/dec_jdt_kuang.png
  17. 203 0
      Assets/Art/UIAssets/decorate/dec_jdt_kuang.png.meta
  18. BIN
      Assets/Art/UIAssets/decorate/dec_jj_huo1.png
  19. 203 0
      Assets/Art/UIAssets/decorate/dec_jj_huo1.png.meta
  20. BIN
      Assets/Art/UIAssets/decorate/dec_jj_huo2.png
  21. 203 0
      Assets/Art/UIAssets/decorate/dec_jj_huo2.png.meta
  22. BIN
      Assets/Art/UIAssets/decorate/dec_ty_kuang.png
  23. 203 0
      Assets/Art/UIAssets/decorate/dec_ty_kuang.png.meta
  24. BIN
      Assets/Art/UIAssets/decorate/dec_yd_shou.png
  25. 203 0
      Assets/Art/UIAssets/decorate/dec_yd_shou.png.meta
  26. 0 8
      Assets/Res/Config/EventConfig.json
  27. 15 9
      Assets/Res/Config/EventLinkConfig.json
  28. 9 0
      Assets/Res/Config/GroupConfig.json
  29. 3 3
      Assets/Res/Config/LanguageChineseConfig.json
  30. 10 0
      Assets/Res/Config/LevelbattleConfig.json
  31. 39 0
      Assets/Res/Config/PlayerGuideConfig.json
  32. 8 8
      Assets/Res/UI/AppBarPanel/AppBarPanel.prefab
  33. 423 5
      Assets/Res/UI/GuidePanel/DialogBox.prefab
  34. 72 0
      Assets/Res/UI/GuidePanel/GuideHand.controller
  35. 8 0
      Assets/Res/UI/GuidePanel/GuideHand.controller.meta
  36. 30 282
      Assets/Res/UI/GuidePanel/GuideHand.prefab
  37. 294 116
      Assets/Res/UI/GuidePanel/GuidePanel.prefab
  38. 106 0
      Assets/Res/UI/GuidePanel/TweenAssetInfoGuideHand.asset
  39. 8 0
      Assets/Res/UI/GuidePanel/TweenAssetInfoGuideHand.asset.meta
  40. 218 0
      Assets/Res/UI/GuidePanel/loop.anim
  41. 8 0
      Assets/Res/UI/GuidePanel/loop.anim.meta
  42. 2 0
      Assets/Res/UIAtlas/tongyong.spriteatlasv2
  43. 2 2
      Assets/Scripts/GameData/ExcelConfig/PlayerGuideConfig.cs
  44. 10 9
      Assets/Scripts/GameUI/GameApplction.cs
  45. 25 3
      Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs
  46. 6 0
      Assets/Scripts/GameUI/UI/GuidePanel/DialogBox.cs
  47. 23 0
      Assets/Scripts/GameUI/UI/GuidePanel/GuidePanel.cs
  48. 22 0
      Assets/Scripts/GameUI/UI/GuidePanel/GuidePanelData.cs
  49. 5 7
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase1.cs
  50. 1 0
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs
  51. 2 1
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase3.cs
  52. 1 1
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs
  53. 106 0
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs
  54. 3 0
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs.meta
  55. 18 3
      Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs
  56. BIN
      Excel2Json/Excel/EventConfig.xlsx
  57. BIN
      Excel2Json/Excel/Language.xlsx
  58. BIN
      Excel2Json/Excel/LevelBattle.xlsx
  59. BIN
      Excel2Json/Excel/PlayerGuide.xlsx
  60. 0 0
      UGUIPack/uguiconfig.db
  61. BIN
      美术/unity_use_ui/Button/btn_xiulianDanyao.png
  62. BIN
      美术/unity_use_ui/Button/btn_xiulianDujie.png
  63. BIN
      美术/unity_use_ui/Button/btn_xiulianTupo.png
  64. 0 0
      美术/unity_use_ui/TextrueJson/bg.txt
  65. 0 0
      美术/unity_use_ui/TextrueJson/jingjie.txt
  66. 0 0
      美术/unity_use_ui/TextrueJson/tongyong.txt
  67. BIN
      美术/unity_use_ui/bg/bg_dongfu2.png
  68. BIN
      美术/unity_use_ui/bg/bg_xiulian.png
  69. BIN
      美术/unity_use_ui/decorate/dec_dikuang_db.png
  70. BIN
      美术/unity_use_ui/decorate/dec_dongfu_bt_db.png
  71. BIN
      美术/unity_use_ui/decorate/dec_jdt_jianbian.png
  72. BIN
      美术/unity_use_ui/decorate/dec_jdt_kuang.png
  73. BIN
      美术/unity_use_ui/decorate/dec_jj_huo1.png
  74. BIN
      美术/unity_use_ui/decorate/dec_jj_huo2.png
  75. BIN
      美术/unity_use_ui/decorate/dec_ty_kuang.png
  76. BIN
      美术/unity_use_ui/decorate/dec_yd_shou.png

BIN
Assets/Art/UIAssets/Button/btn_xiulianDanyao.png


BIN
Assets/Art/UIAssets/Button/btn_xiulianDujie.png


BIN
Assets/Art/UIAssets/Button/btn_xiulianTupo.png


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/bg.txt


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/jingjie.txt


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


BIN
Assets/Art/UIAssets/bg/bg_dongfu2.png


+ 203 - 0
Assets/Art/UIAssets/bg/bg_dongfu2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: D3Mf5Cv+AHN1zdDulgnLv6JJPPFGpzcyJL2c2PoWweVJXkjjosjTGA6tyM8d
+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: 

BIN
Assets/Art/UIAssets/bg/bg_xiulian.png


BIN
Assets/Art/UIAssets/decorate/dec_dikuang_db.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_dikuang_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XixJvS38Ai6GWWOjDU9AMzekivtaEC/+rL2/YhF/3I4yYbFwaTU5QxzTmijz
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DHlJvCqoVy2dSgwmXxzTqKsML9nzn9ss9gnefWoqDxF1QRfpBQ1gMtHouVZW
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Cigd5CuoUnybxZrjavn8xRLlW07gk9VmuV708Ir1IKY4IOuojw/iENZEBS4i
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_jdt_kuang.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_jdt_kuang.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DXsZtiirUS8F9gcdNAuzVDVVb+/8yzUcM8yI6qrJha6vV5s0xcPcVVfpLl7H
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_jj_huo1.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_jj_huo1.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XHlLvCupUXmiIElQnJtFRMgKQdNThojxQs6Q4dCuwVgx2SydMaqxDhu7VFCj
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_jj_huo2.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_jj_huo2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DCtJ4H6vUXp4N7GGc4qQSI+skUaO7oCgv2TN+xbsUKWQ3p/wBU3wr3YX4Kx8
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_ty_kuang.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_ty_kuang.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DSxMvH6pUnlgem/qllalTA7o81Ze6Qs7+dk3tvw3Y46KUDTpoJnqOyFMEvUD
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_yd_shou.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_yd_shou.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DnoZsX+oVXLcZShVImU+Vts/JZ/fom+cy2hJ4BKKQnnWwfaOvmV1Hm4oO4qj
+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: 

+ 0 - 8
Assets/Res/Config/EventConfig.json

@@ -19,14 +19,6 @@
       "PrizeType": [
         5
       ],
-      "PrizeIDs": [
-        1003,
-        999001
-      ],
-      "PrizeNums": [
-        -1000,
-        1
-      ],
       "RefreshProbability": 100,
       "RefreshCount": 0,
       "placeID": 0,

+ 15 - 9
Assets/Res/Config/EventLinkConfig.json

@@ -55,9 +55,9 @@
       "LanID": [
         5004
       ],
-      "DialogueType": 2,
+      "DialogueType": 1,
       "EventID": 1,
-      "optionType": 1,
+      "optionType": 0,
       "optionPara1": [
         1002,
         1003
@@ -66,7 +66,10 @@
         198,
         199
       ],
-      "ResultType": 0
+      "ResultType": 1,
+      "ResultOptions": [
+        1003
+      ]
     },
     {
       "ID": 1002,
@@ -78,7 +81,7 @@
       "LanID": [
         5007
       ],
-      "DialogueType": 2,
+      "DialogueType": 1,
       "EventID": 1,
       "optionType": 2,
       "optionPara1": [
@@ -100,16 +103,19 @@
       "LanID": [
         5008
       ],
-      "DialogueType": 2,
+      "DialogueType": 1,
       "EventID": 1,
-      "optionType": 1,
+      "optionType": 0,
       "optionPara1": [
         1005
       ],
       "optionPara2": [
         200
       ],
-      "ResultType": 0
+      "ResultType": 0,
+      "ResultOptions": [
+        1005
+      ]
     },
     {
       "ID": 1004,
@@ -121,7 +127,7 @@
       "LanID": [
         5009
       ],
-      "DialogueType": 2,
+      "DialogueType": 1,
       "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
@@ -142,7 +148,7 @@
       "LanID": [
         5010
       ],
-      "DialogueType": 2,
+      "DialogueType": 1,
       "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [

+ 9 - 0
Assets/Res/Config/GroupConfig.json

@@ -771,6 +771,15 @@
       "GroupMonster": [
         9001
       ]
+    },
+    {
+      "ID": 10001,
+      "GroupMonsterLevel": [
+        5
+      ],
+      "GroupMonster": [
+        9002
+      ]
     }
   ]
 }

+ 3 - 3
Assets/Res/Config/LanguageChineseConfig.json

@@ -37582,7 +37582,7 @@
     },
     {
       "ID": 10136,
-      "txt": "这里就是仙途事件了,修仙途中的所有事件,都会显示在这里"
+      "txt": "这里就是仙途事件了,修仙途中的所有事件,都会显示在这里"
     },
     {
       "ID": 10137,
@@ -37630,7 +37630,7 @@
     },
     {
       "ID": 10148,
-      "txt": "这是个{}功法,把他放在功法盘{}的附近,会优先释放"
+      "txt": "这是个火功法,把他放在功法盘火的附近,会优先释放"
     },
     {
       "ID": 10149,
@@ -37638,7 +37638,7 @@
     },
     {
       "ID": 10150,
-      "txt": "0"
+      "txt": "已经失败了这么多次,我这次一定要渡劫成功!"
     },
     {
       "ID": 10151,

+ 10 - 0
Assets/Res/Config/LevelbattleConfig.json

@@ -559,6 +559,16 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 10001,
+      "Group": [
+        100001
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

+ 39 - 0
Assets/Res/Config/PlayerGuideConfig.json

@@ -818,6 +818,45 @@
       "ForceOnclick": 1,
       "forceText": 1,
       "voiceFile": ""
+    },
+    {
+      "ID": 501,
+      "Index": 1,
+      "NeedLevel": 0,
+      "groupID": 5,
+      "FingerType": 1,
+      "dialogPos": [
+        -182,
+        -517
+      ],
+      "NpcPos": [
+        422,
+        -100
+      ],
+      "NpcSize": [
+        500,
+        500
+      ],
+      "SpeakerName": 0,
+      "SpeakerStyle": 4,
+      "SpeakerImage": 3,
+      "desc": 10150,
+      "ExtraShow": [
+        "0"
+      ],
+      "Highlighting": 1,
+      "blackAlpha": 0.0,
+      "Handle": 1,
+      "IsSkip": 0,
+      "TextSize": [
+        1240,
+        157
+      ],
+      "reversalFinger": 1,
+      "reversalBox": 2,
+      "ForceOnclick": 0,
+      "forceText": 1,
+      "voiceFile": ""
     }
   ]
 }

+ 8 - 8
Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -419,11 +419,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3250744888703642702}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 83, y: 74.56}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 182, y: 179}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &68198010094673762
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1030,8 +1030,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -286, y: 47}
-  m_SizeDelta: {x: 149.1205, y: 149.1205}
+  m_AnchoredPosition: {x: -278.2, y: 51.301716}
+  m_SizeDelta: {x: 182, y: 187.5966}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9120908431640298670
 MonoBehaviour:
@@ -1458,7 +1458,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 12, y: -27}
+  m_AnchoredPosition: {x: 12, y: -23.599976}
   m_SizeDelta: {x: 172.6341, y: 88.0802}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9118942833055612608
@@ -2859,7 +2859,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 17.7, y: -82}
+  m_AnchoredPosition: {x: 17.7, y: -78.6}
   m_SizeDelta: {x: 0, y: 31.8101}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8586065168883585880

+ 423 - 5
Assets/Res/UI/GuidePanel/DialogBox.prefab

@@ -31,6 +31,7 @@ RectTransform:
   m_Children:
   - {fileID: 2075188202729710725}
   - {fileID: 6671338868129571563}
+  - {fileID: 2917904762579626459}
   m_Father: {fileID: 1967189969305390292}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -541,6 +542,138 @@ MonoBehaviour:
   - {fileID: 6671338868129571562}
   AllComsStateTypes: 040000000400000004000000
   CurrIndex: 0
+--- !u!1 &4304682888902439242
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5168131489409188947}
+  - component: {fileID: 8872223435476264762}
+  - component: {fileID: 2300408869549797983}
+  - component: {fileID: 4266417166884910884}
+  - component: {fileID: 8490990270044222662}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bg_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5168131489409188947
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4304682888902439242}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7188427380891585191}
+  m_Father: {fileID: 2917904762579626459}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 3.6313934, y: 20.999634}
+  m_SizeDelta: {x: 265.63, y: 0}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &8872223435476264762
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4304682888902439242}
+  m_CullTransparentMesh: 1
+--- !u!114 &2300408869549797983
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4304682888902439242}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_duihua_04
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: af8b6f708ee6b254b9e6976ea8852a55, type: 3}
+  packInfo:
+    packName: event
+    packgJsonPath: /Art/UIAssets/TextrueJson\event.txt
+    packgSpritePath: Assets/Res/UIAtlas/event.spriteatlasv2
+    lasetJsonGUID: df80f818a4f258d33b8038600af6f215
+  imageH: 55
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &4266417166884910884
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4304682888902439242}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &8490990270044222662
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4304682888902439242}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 14
+    m_Right: 14
+    m_Top: 20
+    m_Bottom: 14
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &4354351215349679096
 GameObject:
   m_ObjectHideFlags: 0
@@ -621,6 +754,160 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: "\u5FB7\u62C9\u7279\u65AF"
+--- !u!1 &4950131656056151462
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7188427380891585191}
+  - component: {fileID: 2625013836492971179}
+  - component: {fileID: 6228542495581203261}
+  - component: {fileID: 1030597698947415299}
+  - component: {fileID: 5723168494723079871}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: message
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7188427380891585191
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4950131656056151462}
+  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: 5168131489409188947}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 129, y: -45}
+  m_SizeDelta: {x: 230, y: 0}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &2625013836492971179
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4950131656056151462}
+  m_CullTransparentMesh: 1
+--- !u!114 &6228542495581203261
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4950131656056151462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!114 &1030597698947415299
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4950131656056151462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &5723168494723079871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4950131656056151462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 230
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &5965670436055349096
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2917904762579626459}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: dotPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2917904762579626459
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5965670436055349096}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6135927724423511759}
+  - {fileID: 5168131489409188947}
+  m_Father: {fileID: 1878927839389672636}
+  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: 272.8918, y: 76.393}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6604013072318613973
 GameObject:
   m_ObjectHideFlags: 0
@@ -657,7 +944,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 277.6, y: -563}
+  m_AnchoredPosition: {x: 277.6, y: -577}
   m_SizeDelta: {x: 293.8185, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2655084865418590252
@@ -723,6 +1010,7 @@ GameObject:
   - component: {fileID: 6671338867877508514}
   - component: {fileID: 231856457106232909}
   - component: {fileID: 5807659180730001781}
+  - component: {fileID: 939617374492448552}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Dialogue01
@@ -794,7 +1082,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
@@ -806,6 +1094,26 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 56456546456456456
+--- !u!114 &939617374492448552
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6671338867877508526}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 560
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &6671338868129571562
 GameObject:
   m_ObjectHideFlags: 0
@@ -896,7 +1204,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 991429756223984219}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
@@ -970,7 +1278,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: dec_juxing_fang_hujiao
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1043,7 +1351,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -1219,6 +1527,116 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Ratio: 0
   Image: {fileID: 3412874384718582225}
+--- !u!1 &9024537084481092562
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6135927724423511759}
+  - component: {fileID: 7841542219952225401}
+  - component: {fileID: 2575889037169568336}
+  - component: {fileID: 8930762792897725250}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: dec_arrow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6135927724423511759
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9024537084481092562}
+  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: 2917904762579626459}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -0.016830444, y: -0.00048828125}
+  m_SizeDelta: {x: 38, y: 28}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &7841542219952225401
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9024537084481092562}
+  m_CullTransparentMesh: 1
+--- !u!114 &2575889037169568336
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9024537084481092562}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Arrow_Down
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 23f1ff3af41427347a63b9cc35608247, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 9ac47f5fba5fc4d9c019e3c208c4513e
+  imageH: 0
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &8930762792897725250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9024537084481092562}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &9067242470030352876
 GameObject:
   m_ObjectHideFlags: 0

+ 72 - 0
Assets/Res/UI/GuidePanel/GuideHand.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1107 &-3440584703619950180
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 2377992275359103780}
+    m_Position: {x: 260, y: 60, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 2377992275359103780}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GuideHand
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -3440584703619950180}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &2377992275359103780
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: loop
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: da3c8e0579d05c8499296ad82c43ba70, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

+ 8 - 0
Assets/Res/UI/GuidePanel/GuideHand.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WXhOsn/7AC87Qhkbzyhpo/YWd4Cf+wjdJxxUTJrnlUrCeD4DZjVTTf/0kIgg
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 30 - 282
Assets/Res/UI/GuidePanel/GuideHand.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &734780392825207828
 RectTransform:
   m_ObjectHideFlags: 0
@@ -28,15 +28,15 @@ RectTransform:
   m_GameObject: {fileID: 734780392825207831}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.7999999, y: 0.7999999, z: 0.7999999}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 734780393184598389}
   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: 50, y: -50}
-  m_SizeDelta: {x: 256, y: 256}
+  m_AnchoredPosition: {x: 63.8, y: -68.4}
+  m_SizeDelta: {x: 138, y: 149}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &734780392825207826
 CanvasRenderer:
@@ -76,14 +76,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_yd_shou
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: c69b566b4ee58f61c7c30d14c3b8f8ab
   imageH: 256
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -98,8 +98,8 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 734780393184598389}
-  - component: {fileID: 734780393184598386}
   - component: {fileID: 5059957099899968773}
+  - component: {fileID: 6928099528430643331}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: GuideHand
@@ -120,8 +120,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7864728678953829802}
-  - {fileID: 811097775094723773}
   - {fileID: 734780392825207828}
   - {fileID: 1687954597818881594}
   m_Father: {fileID: 0}
@@ -131,27 +129,6 @@ RectTransform:
   m_AnchoredPosition: {x: 532, y: -34}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!95 &734780393184598386
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 734780393184598388}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d75bac13f845c1446850a81178b3975c, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 2
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &5059957099899968773
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -208,257 +185,28 @@ MonoBehaviour:
   - {fileID: 734780392825207831}
   - {fileID: 1687954597818881593}
   AllComsStateTypes: 0400000004000000
-  CurrIndex: 2
---- !u!1 &3001756357951617597
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 811097775094723773}
-  - component: {fileID: 6984995098817828410}
-  - component: {fileID: 4714872258754713434}
-  - component: {fileID: 6744581000791297376}
-  - component: {fileID: 2477662530473524768}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: ui_yindao_quan02
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &811097775094723773
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3001756357951617597}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.49913, y: 0.49913, z: 0.49913}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 734780393184598389}
-  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: 49.99999, y: -49.999996}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!33 &6984995098817828410
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3001756357951617597}
-  m_Mesh: {fileID: 7450741763379908841, guid: 76d2ca31c31fede4db041d5a0a2d9b7b, type: 3}
---- !u!23 &4714872258754713434
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3001756357951617597}
-  m_Enabled: 0
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 36975373dda09ba488bc1eabf4125f23, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!222 &6744581000791297376
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3001756357951617597}
-  m_CullTransparentMesh: 1
---- !u!114 &2477662530473524768
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3001756357951617597}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f5e1d33d8c6440147a652242da460aa0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 36975373dda09ba488bc1eabf4125f23, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  _material: {fileID: 0}
-  _Mesh: {fileID: 7450741763379908841, guid: 76d2ca31c31fede4db041d5a0a2d9b7b, type: 3}
-  isNewMaterial: 0
-  Camera: {fileID: 0}
---- !u!1 &4338058415015620607
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 7864728678953829802}
-  - component: {fileID: 6361107098395485268}
-  - component: {fileID: 6268353892141225543}
-  - component: {fileID: 4227897713924581143}
-  - component: {fileID: 3655264865964967417}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: ui_glow_yindao
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &7864728678953829802
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4338058415015620607}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 480.891, y: 480.891, z: 480.891}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 734780393184598389}
-  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: 49.99999, y: -49.999996}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!33 &6361107098395485268
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4338058415015620607}
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &6268353892141225543
-MeshRenderer:
+  CurrIndex: 0
+--- !u!95 &6928099528430643331
+Animator:
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4338058415015620607}
+  m_GameObject: {fileID: 734780393184598388}
   m_Enabled: 0
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 4f9c215a0ff31284fbbe689a840758a2, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!222 &4227897713924581143
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4338058415015620607}
-  m_CullTransparentMesh: 1
---- !u!114 &3655264865964967417
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4338058415015620607}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f5e1d33d8c6440147a652242da460aa0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 4f9c215a0ff31284fbbe689a840758a2, type: 2}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  _material: {fileID: 0}
-  _Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
-  isNewMaterial: 0
-  Camera: {fileID: 0}
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1001 &8032866909881840609
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -565,11 +313,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -446
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -104
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

+ 294 - 116
Assets/Res/UI/GuidePanel/GuidePanel.prefab

@@ -967,6 +967,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Dialogue04
+    gameObject: {fileID: 120039922047084023}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: dotPoint
+    gameObject: {fileID: 364822825935141282}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &3024282325029660197
 PrefabInstance:
@@ -976,42 +986,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6330229592131453682}
     m_Modifications:
-    - target: {fileID: 313721103517240215, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 313721103517240215, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: _icon_name
-      value: dec_ty_biaoji
-      objectReference: {fileID: 0}
-    - target: {fileID: 313721103517240215, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: CurrSpriteAtlas
-      value: 
-      objectReference: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    - target: {fileID: 313721103517240215, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: packInfo.packName
-      value: tongyong
-      objectReference: {fileID: 0}
-    - target: {fileID: 313721103517240215, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: packInfo.lasetJsonGUID
-      value: 0dc26aad2093bf99c21596c28053b889
-      objectReference: {fileID: 0}
-    - target: {fileID: 313721103517240215, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: packInfo.packgJsonPath
-      value: /Art/UIAssets/TextrueJson\tongyong.txt
-      objectReference: {fileID: 0}
-    - target: {fileID: 313721103517240215, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: packInfo.packgSpritePath
-      value: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-      objectReference: {fileID: 0}
-    - target: {fileID: 734780392825207831, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 734780393184598388, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Name
       value: GuideHand
       objectReference: {fileID: 0}
+    - target: {fileID: 734780393184598388, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -1094,55 +1076,35 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1687954597473891029, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1687954597473891029, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1687954597818881593, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 1687954597818881594, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1687954597818881594, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1687954597818881594, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1687954597818881594, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1687954597818881594, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3642755943783118606, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Enabled
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3642755943783118606, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4714872258754713434, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+    - target: {fileID: 6928099528430643331, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4714872258754713434, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: m_SortingLayer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5059957099899968773, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
-      propertyPath: CurrIndex
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -1173,9 +1135,13 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6330229592131453682}
     m_Modifications:
-    - target: {fileID: 729793689063530974, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+    - target: {fileID: 650014157666585684, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 470
+      objectReference: {fileID: 0}
+    - target: {fileID: 937445499827206289, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1578969768378412423, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_IsActive
@@ -1261,68 +1227,301 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3412874384718582225, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
-      propertyPath: m_RaycastTarget
+    - target: {fileID: 2917904762579626459, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.9931568
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917904762579626459, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.7440961
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917904762579626459, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917904762579626459, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2917904762579626459, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917904762579626459, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 134.57843
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917904762579626459, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 18.647217
+      objectReference: {fileID: 0}
+    - target: {fileID: 3503807962998403382, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3503807962998403382, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3503807962998403382, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 260
+      objectReference: {fileID: 0}
+    - target: {fileID: 3503807962998403382, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 259
+      objectReference: {fileID: 0}
+    - target: {fileID: 3503807962998403382, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -71
+      objectReference: {fileID: 0}
     - target: {fileID: 4272906380317684913, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_Name
       value: DialogBox
       objectReference: {fileID: 0}
-    - target: {fileID: 4897411283920345156, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
-      propertyPath: m_TargetGraphic
+    - target: {fileID: 4950131656056151462, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_Name
+      value: Text_Dialogue04
+      objectReference: {fileID: 0}
+    - target: {fileID: 5168131489409188947, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: CurrIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: AllComs.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: AllComs.Array.data[3]
       value: 
-      objectReference: {fileID: 6491949678967004305}
-    - target: {fileID: 5807659180730001781, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
-      propertyPath: m_FontData.m_FontSize
-      value: 30
+      objectReference: {fileID: 364822825935141282}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: AllComsStateTypes.Array.size
+      value: 4
       objectReference: {fileID: 0}
-    - target: {fileID: 6292012909776935884, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -577
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: AllComsStateTypes.Array.data[3]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[2].StateInfos.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[3].Target
+      value: 
+      objectReference: {fileID: 364822825935141282}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[3].Target
+      value: 
+      objectReference: {fileID: 364822825935141282}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[2].StateInfos.Array.data[3].Target
+      value: 
+      objectReference: {fileID: 364822825935141282}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[0].Target
+      value: 
+      objectReference: {fileID: 4770417467400332109}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[1].Target
+      value: 
+      objectReference: {fileID: 6546039770002011739}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[2].Target
+      value: 
+      objectReference: {fileID: 814894868109143072}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[3].Target
+      value: 
+      objectReference: {fileID: 364822825935141282}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[3].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[3].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[3].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[3].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[2].StateInfos.Array.data[3].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[2].StateInfos.Array.data[3].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[0].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[0].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[1].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[1].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[2].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[2].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[3].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[3].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[3].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[3].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[2].StateInfos.Array.data[3].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[0].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[1].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[2].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[3].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5785473085463611746, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: data.Array.data[3].StateInfos.Array.data[3].UIStateV4Datas.Array.data[0].x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5965670436055349096, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_IsActive
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6671338867877508527, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6671338867877508527, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6671338867877508527, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 560
       objectReference: {fileID: 0}
     - target: {fileID: 6671338867877508527, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 332
       objectReference: {fileID: 0}
     - target: {fileID: 6671338867877508527, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_AnchoredPosition.y
+      value: -78.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6671338868129571562, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6671338868129571563, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 664
       objectReference: {fileID: 0}
-    - target: {fileID: 8842748389199906682, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
-      propertyPath: m_RaycastTarget
+    - target: {fileID: 7188427380891585191, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7188427380891585191, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchorMin.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7188427380891585191, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7188427380891585191, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 129
+      objectReference: {fileID: 0}
+    - target: {fileID: 7188427380891585191, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -45
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 6671338867877508526, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 8043133813524983868}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+--- !u!114 &120039922047084023 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6228542495581203261, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+  m_PrefabInstance: {fileID: 6330457756569538250}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &364822825935141282 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5965670436055349096, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+  m_PrefabInstance: {fileID: 6330457756569538250}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &523190011978524607 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5807659180730001781, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
   m_PrefabInstance: {fileID: 6330457756569538250}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 814894868293352292}
+  m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
@@ -1339,31 +1538,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &814894868293352292 stripped
+--- !u!1 &814894868109143072 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 6671338867877508526, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+  m_CorrespondingSourceObject: {fileID: 6671338868129571562, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
   m_PrefabInstance: {fileID: 6330457756569538250}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &8043133813524983868
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 814894868293352292}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: 560
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!114 &1288667971007297869 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 5059804606052284295, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
@@ -1380,7 +1559,7 @@ MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 4897411283920345156, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
   m_PrefabInstance: {fileID: 6330457756569538250}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  m_GameObject: {fileID: 814894868109143072}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@@ -1397,6 +1576,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &4770417467400332109 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1578969768378412423, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+  m_PrefabInstance: {fileID: 6330457756569538250}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &4779125100819128766 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1551649772581662580, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
@@ -1429,17 +1613,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &6491949678967004305 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 991429756223984219, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
+--- !u!1 &6546039770002011739 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 937445499827206289, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}
   m_PrefabInstance: {fileID: 6330457756569538250}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!114 &8684834409676791579 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3412874384718582225, guid: 100fb54f4740f6e49aec0b41541234e1, type: 3}

+ 106 - 0
Assets/Res/UI/GuidePanel/TweenAssetInfoGuideHand.asset

@@ -0,0 +1,106 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 81c305ba541a4659ad97bd292322e9b3, type: 3}
+  m_Name: TweenAssetInfoGuideHand
+  m_EditorClassIdentifier: 
+  allTweenInfo:
+  - Foldout: 1
+    TweenType: 0
+    duration: 1
+    delay: 0
+    TweenBasic:
+      Foldout: 1
+      duration: 1
+      delay: 0
+      currSchedule: 0
+      TweenRectTransformInfos:
+      - TweenRectTransformType: 2
+        TweenLerpType: 1
+        Start: {x: 0.8, y: 0.8, z: 0.8}
+        End: {x: 0.8, y: 0.8, z: 0.8}
+        startX:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0.01355955
+            value: 0.8428616
+            inSlope: 0.12480209
+            outSlope: 0.12480209
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 0.6701219
+            value: 0.92480195
+            inSlope: 0.17637959
+            outSlope: 0.17637959
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0.33333334
+          - serializedVersion: 3
+            time: 1
+            value: 1
+            inSlope: 0.2279571
+            outSlope: 0.2279571
+            tangentMode: 34
+            weightedMode: 0
+            inWeight: 0.33333334
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startY:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        startZ:
+          serializedVersion: 2
+          m_Curve: []
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+    TweenCanvasGroup:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      TweenLerpType: 0
+      StartAlpha: 0
+      EndAlpha: 0
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenGraphic:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0
+      startColor: {r: 0, g: 0, b: 0, a: 0}
+      endColor: {r: 0, g: 0, b: 0, a: 0}
+      startX:
+        serializedVersion: 2
+        m_Curve: []
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    TweenPlayFx:
+      Foldout: 0
+      duration: 0
+      delay: 0
+      currSchedule: 0

+ 8 - 0
Assets/Res/UI/GuidePanel/TweenAssetInfoGuideHand.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XXwYtyyrVHpDf4NnAuT5V/dOAqcr9VTaSMx1cHbxFpMv+LeKxgi+eX34dToy
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 218 - 0
Assets/Res/UI/GuidePanel/loop.anim

@@ -0,0 +1,218 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: loop
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 0.85, y: 0.85, z: 0.85}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 1
+        value: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Image
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 83635035
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0.85
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.99999994
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: Image
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0.85
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.99999994
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: Image
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0.85
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.99999994
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: Image
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+  m_ACLContext:
+    m_RootBone: {fileID: 0}
+    ACLCompressionLevel: 0
+    ACLCurvePrecision: 0.01
+    UseACLCurve: 0

+ 8 - 0
Assets/Res/UI/GuidePanel/loop.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Wysc5iL4U36z78ym8FqXZE+giAuDp2NVqzlPtv6DjdJYwRTUAj4ciihGzJFE
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -109,6 +109,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: bf26621577f885940b01f88716447a8b, type: 3}
     - {fileID: 2800000, guid: f596587448fca754b958dee86ccbcaf7, type: 3}
     - {fileID: 2800000, guid: abb710a638b53dd46a643139c8216358, type: 3}
+    - {fileID: 2800000, guid: 2fc9d412c01b5d44c9b9e874ec11fde2, type: 3}
     - {fileID: 2800000, guid: 99b0a1fe472cb4343b017d299afc6171, type: 3}
     - {fileID: 2800000, guid: 34d897f32e8fe75439b3a49dc20388e8, type: 3}
     - {fileID: 2800000, guid: aeafda9bb34c3f644ba81a4bf9025801, type: 3}
@@ -126,6 +127,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 43ee7ca9b6e77b041a5a5c40598a7267, type: 3}
     - {fileID: 2800000, guid: 2d2e9b702b9dc20418741c36f06c90b5, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
+    - {fileID: 2800000, guid: 1064e5697afcf2e4380fce9ef6f3716c, type: 3}
     - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}
     - {fileID: 2800000, guid: aec6227823c7f75498752720902c7876, type: 3}

+ 2 - 2
Assets/Scripts/GameData/ExcelConfig/PlayerGuideConfig.cs

@@ -105,7 +105,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///对话风格 1: 仅文本框 2: 头像+框 3: 立绘
+		///对话风格 1: 仅文本框 2: 头像+框 3: 立绘 4.气泡对话
 		/// </summary>
 #if !COMBAT_SERVER
 		public int SpeakerStyle;
@@ -115,7 +115,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///说话人形象 使用HeroModelID  当SpeakerStyle=2,3生效
+		///说话人形象 使用EventNpclID  当SpeakerStyle=2,3生效
 		/// </summary>
 #if !COMBAT_SERVER
 		public int SpeakerImage;

+ 10 - 9
Assets/Scripts/GameUI/GameApplction.cs

@@ -171,26 +171,26 @@ public class GameApplction : IGameStart
             .TaoismSkillId);
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
-            MainPanel mainPanel = await MainPanel.OpenPanel();
-            /*if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
+            if (!PlayerGuideManager.Instance.GuideIsCanDo(5))
             {
-                mainPanel.GObjectPoolInterface.SetActive(false);
-            }*/
+                MainPanel mainPanel = await MainPanel.OpenPanel();
+                // mainPanel.GObjectPoolInterface.SetActive(false);
+            }
         }
 
 
         gameStartUIPanel.ShowMassge("loadFinish");
         gameStartUIPanel.SetSlider(1f);
 
-        //XinShouCombat();
+        XinShouCombat();
     }
 
     public async void XinShouCombat()
     {
-        if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
+        if (PlayerGuideManager.Instance.GuideIsCanDo(5))
         {
             CTask cTask = CTask.Create();
-            CombatDrive.Instance.LoadLevelBattleCombat(1002, false, -1,
+            CombatDrive.Instance.LoadLevelBattleCombat(10001, false, -1,
                 delegate(bool isWin)
                 {
                     LogTool.Log("战斗完成" + isWin);
@@ -204,8 +204,9 @@ public class GameApplction : IGameStart
             AccountFileInfo.Instance.playerData.isTiggerPlot = true;
 
             AccountFileInfo.Instance.SavePlayerData();
-            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
-            mainPanel.GObjectPoolInterface.SetActive(true);
+
+            MainPanel mainPanel = await MainPanel.OpenPanel();
+    
         }
     }
 }

+ 25 - 3
Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -4,9 +4,12 @@ using Common.Utility.CombatEvent;
 using Excel2Json;
 using Fort23.Core;
 using GameLogic.Bag;
+using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
 using GameLogic.Combat.Hero;
 using GameLogic.Combat.Skill;
+using OfficeOpenXml.FormulaParsing.Utilities;
 using UnityEngine;
 
 namespace Fort23.Mono
@@ -30,6 +33,24 @@ namespace Fort23.Mono
             zhuanPanLogic.ShowPanel();
         }
 
+        public override CTask GetFocus()
+        {
+            if (CombatDrive.Instance.CombatController.CombatTypeBasic is LevelBattleCombatType)
+            {
+                LevelBattleCombatType levelBattleCombatType =
+                    CombatDrive.Instance.CombatController.CombatTypeBasic as LevelBattleCombatType;
+                if (levelBattleCombatType.levelbattleConfig.ID == 10001)
+                {
+                    if (PlayerGuideManager.Instance.GuideIsCanDo(5))
+                    {
+                        PlayerGuideManager.Instance.SetGuid(5);
+                    }
+                }
+            }
+
+            return base.GetFocus();
+        }
+
         private void Init()
         {
             isAddStack = true;
@@ -61,7 +82,7 @@ namespace Fort23.Mono
         {
             // CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddMagicWeaponHeroEntity,
             //     AddMagicWeaponHeroEntity);
-           
+
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.ShowUseMagicWeaponName, UseMagicWeapon);
             StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
         }
@@ -77,7 +98,7 @@ namespace Fort23.Mono
             Vector3 pos = Vector3.zero;
             if (combatMagicWeaponEntity.IsEnemy)
             {
-                 pos = combatMagicWeaponEntity.GameObject.transform.TransformPoint(new Vector3(-1, 2, 0));
+                pos = combatMagicWeaponEntity.GameObject.transform.TransformPoint(new Vector3(-1, 2, 0));
             }
             else
             {
@@ -136,7 +157,8 @@ namespace Fort23.Mono
             playerHeroHpWidget.isFollowTarget = false;
             playerHeroHpWidget.Init(CombatController.currActiveCombat.playerHeroEntity);
 
-            CombatHeroEntity[] allEnemy = CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
+            CombatHeroEntity[] allEnemy =
+                CombatController.currActiveCombat.CombatHeroController.GetHero(true, out int maxCount);
             for (int i = 0; i < maxCount; i++)
             {
                 CombatHeroEntity enemy = allEnemy[i];

+ 6 - 0
Assets/Scripts/GameUI/UI/GuidePanel/DialogBox.cs

@@ -19,6 +19,7 @@ namespace Fort23.Mono
         public Text Text_Dialogue01;
         public Text Text_Dialogue02;
         public Text Text_Dialogue03;
+        public Text Text_Dialogue04;
 
         //  public BoxCollider boxCol;
 
@@ -52,6 +53,7 @@ namespace Fort23.Mono
             Text_Dialogue01 = guidePanel.Text_Dialogue01;
             Text_Dialogue02 = guidePanel.Text_Dialogue02;
             Text_Dialogue03 = guidePanel.Text_Dialogue03;
+            Text_Dialogue04 = guidePanel.Text_Dialogue04;
         }
 
         public void Open(BetterList<string> list, Action action)
@@ -95,6 +97,7 @@ namespace Fort23.Mono
                 cTask.SetResult();
             };
             NpcIcon.icon_name = heroModelConfig.icon;
+            NpcNameText.text = LanguageManager.Instance.Text(heroModelConfig.name);
             // HeroIcon.icon_name = heroModelConfig.HeroUIIconName;
 
 
@@ -174,6 +177,9 @@ namespace Fort23.Mono
                 case 3:
                     Content = Text_Dialogue03;
                     break;
+                case 4:
+                    Content = Text_Dialogue04;
+                    break;
             }
         }
     }

+ 23 - 0
Assets/Scripts/GameUI/UI/GuidePanel/GuidePanel.cs

@@ -1,5 +1,7 @@
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Combat;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -52,6 +54,27 @@ namespace Fort23.Mono
 
             Btn_MessageBG.onClick.AddListener(() => { PlayerGuideManager.Instance.dialogBox.OnClickScreen(); });
         }
+        
+        
+        
+        [CustomMethod(customMethodType: CustomMethodType.Update)]
+        public void Update()
+        {
+            // if (UIManager.Instance.currOpenPanel == null || UIManager.Instance.currOpenPanel.GetType() != typeof(MainPanel) || UIManager.Instance.popUIPanels.Count > 0)
+            // {
+            //     return;
+            // }
+
+            Vector3 worldPos = CombatDrive.Instance.CombatController.playerHeroEntity.combatHeroGameObject.hpTransform.position;
+            Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
+            Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
+            dotPoint.transform.position = p2;
+
+          
+            
+        }
+        
+        
 
         public void SetTarget(GameObject gameObject)
         {

+ 22 - 0
Assets/Scripts/GameUI/UI/GuidePanel/GuidePanelData.cs

@@ -206,6 +206,28 @@ namespace Fort23.Mono
 	      return _Btn_Skip;
 	     }
 	   }
+	  private Text _Text_Dialogue04;
+	  public Text Text_Dialogue04
+	   {
+	   get{
+	      if (_Text_Dialogue04 == null)
+	       {
+	         _Text_Dialogue04  = GetUIUnit<Text>("Text_Dialogue04"); 
+	       }
+	      return _Text_Dialogue04;
+	     }
+	   }
+	  private GameObject _dotPoint;
+	  public GameObject dotPoint
+	   {
+	   get{
+	      if (_dotPoint == null)
+	       {
+	         _dotPoint  = GetUIUnit<GameObject>("dotPoint"); 
+	       }
+	      return _dotPoint;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 5 - 7
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase1.cs

@@ -27,7 +27,7 @@ namespace Fort23.Mono.Phases
             actionList.Add(OnStep101);
             actionList.Add(OnStep102);
             actionList.Add(OnStep103);
-     
+
 
             actionList.Add(OnStepEnd);
         }
@@ -78,13 +78,12 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep101(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            await pgm.ConfigLogic(101, delegate()
-            {
-               
-            });
+            UIManager.Instance.HideUIUIPanel<RewardsPanel>();
+            await pgm.ConfigLogic(101, delegate() { });
             pgm.SetOnClickMask(true);
 
-            TipMessagePanelType2 tipMessagePanelType2 = await TipMessagePanelType2.OpenTipMessagePanel(10131,isClose:false);
+            TipMessagePanelType2 tipMessagePanelType2 =
+                await TipMessagePanelType2.OpenTipMessagePanel(10131, isClose: false);
             await tipMessagePanelType2.UIClosed();
             if (PlayerGuideManager.Instance.GuideIsCanDo(1, 1))
             {
@@ -106,7 +105,6 @@ namespace Fort23.Mono.Phases
                 pgm.SetfxTransVisiable(false);
                 pgm.NextGuide();
             });
-
         }
 
 

+ 1 - 0
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs

@@ -209,6 +209,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStepEnd(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             pgm.SetBlackBaseVisiable(false);
             ForceGuideOver();
         }

+ 2 - 1
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase3.cs

@@ -86,6 +86,7 @@ namespace Fort23.Mono.Phases
             pgm.SetfxTransVisiable(true);
             pgm.SetMaskTarget(gameObject);
             pgm.SetShowFramePosAndSize(localPos, size, 0, gameObject);
+            AccountFileInfo.Instance.playerData.divineSensePoint += 300;
 
             await pgm.ConfigLogic(301, delegate() { });
 
@@ -127,7 +128,7 @@ namespace Fort23.Mono.Phases
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 
             pgm.SetfxTransVisiable(true);
-            pgm.SetMaskTarget(gameObject);
+            // pgm.SetMaskTarget(gameObject);
             size = new Vector2(718, 938);
             localPos = new Vector2(0, -96);
             pgm.SetShowFramePosAndSize(localPos, size, 0, null);

+ 1 - 1
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs

@@ -163,7 +163,7 @@ namespace Fort23.Mono.Phases
 
             await pgm.ConfigLogic(404, delegate() { });
 
-            pgm.SetFingerPos(localPos);
+            pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
         }
 

+ 106 - 0
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs

@@ -0,0 +1,106 @@
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat;
+using GameLogic.Combat.CombatTool;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono.Phases
+{
+    public class Phase5 : IGuideLogic
+    {
+        public PlayerGuideManager pgm;
+
+
+        public BetterList<string> dialogList = new BetterList<string>();
+
+
+        private bool once = false;
+
+        public Phase5(PlayerGuideManager guideManager)
+        {
+            this.pgm = guideManager;
+            once = true;
+        }
+
+        public override void Active()
+        {
+            base.Active();
+            actionList.Add(OnStep501);
+
+            actionList.Add(OnStepEnd);
+        }
+
+        public override void Begin()
+        {
+            guideID = 5;
+            guideIdx = -1;
+            pgm.isForceDone = false;
+            pgm.isTriggerDone = false;
+        }
+
+        public override void End()
+        {
+        }
+
+        public override async CTask Guide()
+        {
+            if (actionList.Count > guideIdx)
+            {
+                pgm.ResetPlayerGuide();
+                guideIdx++;
+
+
+                SaveStep(guideIdx);
+                await actionList[guideIdx](null);
+            }
+            else
+            {
+                LogTool.Error("没有引导了,强制结束。出错步骤,:" + pgm.curPhase + guideIdx);
+                pgm.isForceDone = true;
+            }
+        }
+
+        public override void LogicRelase()
+        {
+            actionList.Clear();
+        }
+
+        public override void LogicUpdate()
+        {
+        }
+
+
+        /// <summary>
+        /// 点击功法
+        /// </summary>
+        /// <param name="obj"></param>
+        public async CTask OnStep501(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            pgm.SetBlackAlpha(0.05f);
+            pgm.SetOnClickMask(true);
+            await TimerComponent.Instance.WaitAsync(1000);
+            pgm.SetOnClickMask(false);
+            CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
+            await pgm.ConfigLogic(501, delegate() { pgm.NextGuide(); });
+        }
+
+        public async CTask OnStepEnd(UnityEngine.Object obj)
+        {
+            pgm.StepInit();
+            CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+            pgm.SetBlackBaseVisiable(false);
+            ForceGuideOver();
+        }
+
+        /// <summary>
+        /// 引导完成
+        /// </summary>
+        private void ForceGuideOver()
+        {
+            pgm.CloseForceGuide();
+            pgm.RestGuide();
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bf583d075ebc48bb86471d565cde370d
+timeCreated: 1757647507

+ 18 - 3
Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -5,6 +5,7 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.Mono.Phases;
 using Fort23.UTool;
+using GameLogic.Bag;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -676,6 +677,16 @@ namespace Fort23.Mono
             IsStepSkip = false;
             guideConfig = ConfigComponent.Instance.Get<PlayerGuideConfig>(configID);
 
+            if (guideConfig.AwardItem != null)
+            {
+                for (var i = 0; i < guideConfig.AwardItem.Length; i++)
+                {
+                    PlayerManager.Instance.BagController.AddItem(new ItemInfo(guideConfig.AwardItem[i],
+                        guideConfig.AwardItemNum[i]));
+                }
+            }
+
+
             // if (IsUseServerData)
             // {
             //     PlayerManager.Instance.PlayerGuideDataComponent.UpdateData(configID);
@@ -906,6 +917,10 @@ namespace Fort23.Mono
                 case 3:
                     guidePanel.DialogBoxState.ChangeState(2);
 
+                    break;
+                case 4:
+                    guidePanel.DialogBoxState.ChangeState(3);
+
                     break;
             }
 
@@ -1103,7 +1118,7 @@ namespace Fort23.Mono
             }
         }
 
-        public Vector3 Setpos(Vector3 pos, Vector2 size,  GameObject gameObject )
+        public Vector3 Setpos(Vector3 pos, Vector2 size, GameObject gameObject)
         {
             RectTransform rectTransform = gameObject.GetComponent<RectTransform>();
             Vector2 pivot = rectTransform.pivot;
@@ -1113,9 +1128,9 @@ namespace Fort23.Mono
             float x = pos.x - size.x * pivot1.x;
             float y = pos.y - size.y * pivot1.y;
 
-        return new Vector3(x, y, 0);
+            return new Vector3(x, y, 0);
         }
-        
+
 
         /// <summary>
         /// 设置文本大小

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/LevelBattle.xlsx


BIN
Excel2Json/Excel/PlayerGuide.xlsx


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
UGUIPack/uguiconfig.db


BIN
美术/unity_use_ui/Button/btn_xiulianDanyao.png


BIN
美术/unity_use_ui/Button/btn_xiulianDujie.png


BIN
美术/unity_use_ui/Button/btn_xiulianTupo.png


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
美术/unity_use_ui/TextrueJson/bg.txt


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
美术/unity_use_ui/TextrueJson/jingjie.txt


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


BIN
美术/unity_use_ui/bg/bg_dongfu2.png


BIN
美术/unity_use_ui/bg/bg_xiulian.png


BIN
美术/unity_use_ui/decorate/dec_dikuang_db.png


BIN
美术/unity_use_ui/decorate/dec_dongfu_bt_db.png


BIN
美术/unity_use_ui/decorate/dec_jdt_jianbian.png


BIN
美术/unity_use_ui/decorate/dec_jdt_kuang.png


BIN
美术/unity_use_ui/decorate/dec_jj_huo1.png


BIN
美术/unity_use_ui/decorate/dec_jj_huo2.png


BIN
美术/unity_use_ui/decorate/dec_ty_kuang.png


BIN
美术/unity_use_ui/decorate/dec_yd_shou.png


Vissa filer visades inte eftersom för många filer har ändrats