Procházet zdrojové kódy

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

LT před 2 dny
rodič
revize
a7da3acce0
100 změnil soubory, kde provedl 5660 přidání a 1800 odebrání
  1. binární
      Assets/Art/UIAssets/Button/btn_xiulianDanyao.png
  2. binární
      Assets/Art/UIAssets/Button/btn_xiulianDujie.png
  3. binární
      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ární
      Assets/Art/UIAssets/bg/bg_dongfu2.png
  8. 2 2
      Assets/Art/UIAssets/bg/bg_dongfu2.png.meta
  9. binární
      Assets/Art/UIAssets/bg/bg_xiulian.png
  10. binární
      Assets/Art/UIAssets/decorate/dec_dikuang_db.png
  11. 203 0
      Assets/Art/UIAssets/decorate/dec_dikuang_db.png.meta
  12. binární
      Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png
  13. 2 2
      Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png.meta
  14. binární
      Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png
  15. 2 2
      Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png.meta
  16. binární
      Assets/Art/UIAssets/decorate/dec_jdt_kuang.png
  17. 203 0
      Assets/Art/UIAssets/decorate/dec_jdt_kuang.png.meta
  18. binární
      Assets/Art/UIAssets/decorate/dec_jj_huo1.png
  19. 203 0
      Assets/Art/UIAssets/decorate/dec_jj_huo1.png.meta
  20. binární
      Assets/Art/UIAssets/decorate/dec_jj_huo2.png
  21. 203 0
      Assets/Art/UIAssets/decorate/dec_jj_huo2.png.meta
  22. binární
      Assets/Art/UIAssets/decorate/dec_ty_kuang.png
  23. 203 0
      Assets/Art/UIAssets/decorate/dec_ty_kuang.png.meta
  24. binární
      Assets/Art/UIAssets/decorate/dec_yd_shou.png
  25. 203 0
      Assets/Art/UIAssets/decorate/dec_yd_shou.png.meta
  26. 1 1
      Assets/Res/Aduio/UI/combat_win.wav.meta
  27. 1 1
      Assets/Res/Aduio/UI/ui_button.ogg.meta
  28. 0 8
      Assets/Res/Config/EventConfig.json
  29. 15 9
      Assets/Res/Config/EventLinkConfig.json
  30. 9 0
      Assets/Res/Config/GroupConfig.json
  31. 3 3
      Assets/Res/Config/LanguageChineseConfig.json
  32. 10 0
      Assets/Res/Config/LevelbattleConfig.json
  33. 39 0
      Assets/Res/Config/PlayerGuideConfig.json
  34. 106 8
      Assets/Res/UI/AppBarPanel/AppBarPanel.prefab
  35. 95 14
      Assets/Res/UI/AppBarPanel/TitlePanel.prefab
  36. 56 0
      Assets/Res/UI/BoxPanel/BoxPanel.prefab
  37. 14 0
      Assets/Res/UI/BoxPanel/GachaPanel.prefab
  38. 28 0
      Assets/Res/UI/DivineSence/BossInfoPanel.prefab
  39. 42 0
      Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab
  40. 14 0
      Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab
  41. 14 0
      Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab
  42. 423 5
      Assets/Res/UI/GuidePanel/DialogBox.prefab
  43. 72 0
      Assets/Res/UI/GuidePanel/GuideHand.controller
  44. 8 0
      Assets/Res/UI/GuidePanel/GuideHand.controller.meta
  45. 30 282
      Assets/Res/UI/GuidePanel/GuideHand.prefab
  46. 294 116
      Assets/Res/UI/GuidePanel/GuidePanel.prefab
  47. 106 0
      Assets/Res/UI/GuidePanel/TweenAssetInfoGuideHand.asset
  48. 8 0
      Assets/Res/UI/GuidePanel/TweenAssetInfoGuideHand.asset.meta
  49. 218 0
      Assets/Res/UI/GuidePanel/loop.anim
  50. 8 0
      Assets/Res/UI/GuidePanel/loop.anim.meta
  51. 48 200
      Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab
  52. 1479 264
      Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab
  53. binární
      Assets/Res/UI/HeroInformainPanel/修炼界面-大突破.png
  54. binární
      Assets/Res/UI/HeroInformainPanel/修炼界面-小突破成功.png
  55. binární
      Assets/Res/UI/HeroInformainPanel/修炼界面-打开丹药.png
  56. binární
      Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫-添加丹药.png
  57. binární
      Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫-添加物品.png
  58. 0 203
      Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫-添加物品.png.meta
  59. binární
      Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫.png
  60. 0 203
      Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫.png.meta
  61. binární
      Assets/Res/UI/HeroInformainPanel/修炼界面.png
  62. 0 203
      Assets/Res/UI/HeroInformainPanel/修炼界面.png.meta
  63. binární
      Assets/Res/UI/HeroInformainPanel/洞府-修炼.png
  64. 1 1
      Assets/Res/UI/HeroInformainPanel/洞府-修炼.png.meta
  65. binární
      Assets/Res/UI/HeroInformainPanel/道侣.png
  66. 0 203
      Assets/Res/UI/HeroInformainPanel/道侣.png.meta
  67. 14 0
      Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab
  68. 56 0
      Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab
  69. 84 0
      Assets/Res/UI/MainPanel/MainPanel.prefab
  70. 28 0
      Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab
  71. 14 0
      Assets/Res/UI/ShopPanel/ShopBtnWidget.prefab
  72. 14 0
      Assets/Res/UI/ShopPanel/ShopBuyItemPanel.prefab
  73. 28 0
      Assets/Res/UI/ShopPanel/ShopGachaPanel.prefab
  74. 1 1
      Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab
  75. 607 0
      Assets/Res/UI/SkillMassgePanel.prefab
  76. 7 0
      Assets/Res/UI/SkillMassgePanel.prefab.meta
  77. 126 0
      Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab
  78. 28 0
      Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab
  79. 6 1
      Assets/Res/UIAtlas/jingjie.spriteatlasv2
  80. 2 0
      Assets/Res/UIAtlas/tongyong.spriteatlasv2
  81. 1 1
      Assets/Scripts/Core/Audio/AudioButton.cs
  82. 2 2
      Assets/Scripts/GameData/ExcelConfig/PlayerGuideConfig.cs
  83. 10 9
      Assets/Scripts/GameUI/GameApplction.cs
  84. 3 1
      Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs
  85. 5 0
      Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs
  86. 2 0
      Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs
  87. 2 0
      Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs
  88. 25 3
      Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs
  89. 41 40
      Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs
  90. 6 0
      Assets/Scripts/GameUI/UI/GuidePanel/DialogBox.cs
  91. 23 0
      Assets/Scripts/GameUI/UI/GuidePanel/GuidePanel.cs
  92. 22 0
      Assets/Scripts/GameUI/UI/GuidePanel/GuidePanelData.cs
  93. 5 7
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase1.cs
  94. 1 0
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs
  95. 2 1
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase3.cs
  96. 1 1
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs
  97. 106 0
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs
  98. 3 0
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase5.cs.meta
  99. 18 3
      Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs
  100. 1 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/CaveMainPanel.cs

binární
Assets/Art/UIAssets/Button/btn_xiulianDanyao.png


binární
Assets/Art/UIAssets/Button/btn_xiulianDujie.png


binární
Assets/Art/UIAssets/Button/btn_xiulianTupo.png


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/bg.txt


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/jingjie.txt


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


binární
Assets/Art/UIAssets/bg/bg_dongfu2.png


+ 2 - 2
Assets/Res/UI/HeroInformainPanel/修炼界面-大突破.png.meta → Assets/Art/UIAssets/bg/bg_dongfu2.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DH4f5y78VCk7+ngCIpT8qb18CpH41b9KN1pUxBsNV4MtLU8P8eqnEK5bsynY
+guid: D3Mf5Cv+AHN1zdDulgnLv6JJPPFGpzcyJL2c2PoWweVJXkjjosjTGA6tyM8d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

binární
Assets/Art/UIAssets/bg/bg_xiulian.png


binární
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: 24, y: 0, z: 24, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

binární
Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png


+ 2 - 2
Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫-添加丹药.png.meta → Assets/Art/UIAssets/decorate/dec_dongfu_bt_db.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DCsZt3ysB3PWO312WqwmdKJmpVmqDp5+SHOyeHzBJpGg4cHkrYXrx/l1f79Q
+guid: DHlJvCqoVy2dSgwmXxzTqKsML9nzn9ss9gnefWoqDxF1QRfpBQ1gMtHouVZW
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

binární
Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png


+ 2 - 2
Assets/Res/UI/HeroInformainPanel/修炼界面-小突破成功.png.meta → Assets/Art/UIAssets/decorate/dec_jdt_jianbian.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XXsf43+uAHrEfFPaonMNRNEVufcUiI6H/NiRuff4dtBANAJ89AwEBUijI+N5
+guid: Cigd5CuoUnybxZrjavn8xRLlW07gk9VmuV708Ir1IKY4IOuojw/iENZEBS4i
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

binární
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ární
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ární
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ární
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ární
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: 

+ 1 - 1
Assets/Res/Aduio/UI/combat_win.wav.meta

@@ -13,7 +13,7 @@ AudioImporter:
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}
-  forceToMono: 0
+  forceToMono: 1
   normalize: 1
   loadInBackground: 0
   ambisonic: 0

+ 1 - 1
Assets/Res/Aduio/UI/ui_button.ogg.meta

@@ -13,7 +13,7 @@ AudioImporter:
     conversionMode: 0
     preloadAudioData: 0
   platformSettingOverrides: {}
-  forceToMono: 0
+  forceToMono: 1
   normalize: 1
   loadInBackground: 0
   ambisonic: 0

+ 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": ""
     }
   ]
 }

+ 106 - 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
@@ -1003,6 +1003,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3250744888703642702}
   - component: {fileID: 9120908431640298670}
+  - component: {fileID: 8215570333168314116}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: bnt_shengShi
@@ -1030,8 +1031,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:
@@ -1077,6 +1078,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8215570333168314116
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1695594006432185856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &1763543629339751110
 GameObject:
   m_ObjectHideFlags: 0
@@ -1165,6 +1179,7 @@ GameObject:
   - component: {fileID: 4181439185128367319}
   - component: {fileID: 2609989254926019074}
   - component: {fileID: 759492161019403368}
+  - component: {fileID: 7252785412647633890}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Menu
@@ -1288,6 +1303,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7252785412647633890
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1973807357976626307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2349479014257640583
 GameObject:
   m_ObjectHideFlags: 0
@@ -1458,7 +1486,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
@@ -2158,6 +2186,7 @@ GameObject:
   - component: {fileID: 6167623955488994832}
   - component: {fileID: 7753631802842447130}
   - component: {fileID: 553848956453578161}
+  - component: {fileID: 5335756367815044491}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Shop
@@ -2355,6 +2384,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &5335756367815044491
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4816422879295191460}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4883639511437899985
 GameObject:
   m_ObjectHideFlags: 0
@@ -2859,7 +2901,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
@@ -3294,6 +3336,7 @@ GameObject:
   - component: {fileID: 4164584344635147333}
   - component: {fileID: 4539428625316042701}
   - component: {fileID: 8481861464388171268}
+  - component: {fileID: 7223344407103502978}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_DongFu
@@ -3491,6 +3534,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7223344407103502978
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6600899041924302467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6972003309492748989
 GameObject:
   m_ObjectHideFlags: 0
@@ -3505,6 +3561,7 @@ GameObject:
   - component: {fileID: 2988647656428222839}
   - component: {fileID: 8687067159130349924}
   - component: {fileID: 1550958269248561588}
+  - component: {fileID: 7940123243640709996}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_GongFa
@@ -3702,6 +3759,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7940123243640709996
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6972003309492748989}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6989890744348440139
 GameObject:
   m_ObjectHideFlags: 0
@@ -3928,6 +3998,7 @@ GameObject:
   - component: {fileID: 9062925167079628804}
   - component: {fileID: 3259496073566101817}
   - component: {fileID: 1834289658214911251}
+  - component: {fileID: 6561864756815396146}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon1
@@ -4050,6 +4121,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6561864756815396146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8859662043645165086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9122554430680811667
 GameObject:
   m_ObjectHideFlags: 0
@@ -4064,6 +4148,7 @@ GameObject:
   - component: {fileID: 553404141406869920}
   - component: {fileID: 6088456933348836006}
   - component: {fileID: 6914948721015485670}
+  - component: {fileID: 3691452578137234337}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_HeroInfomation
@@ -4261,3 +4346,16 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &3691452578137234337
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9122554430680811667}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button

+ 95 - 14
Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -72,7 +72,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: -166, y: -7.6}
+  m_AnchoredPosition: {x: -193.1, y: 21.954}
   m_SizeDelta: {x: 220.1661, y: 50.1693}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8974566408459148074
@@ -105,12 +105,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
+    m_FontSize: 31
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 6
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -174,7 +174,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1814268402840942092}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -286,6 +286,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1997598407414093240
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 420817501019437217}
+  - component: {fileID: 4884945233167774298}
+  - component: {fileID: 7422819589632924071}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &420817501019437217
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1997598407414093240}
+  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: 1315830646960664688}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.00001335144, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4884945233167774298
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1997598407414093240}
+  m_CullTransparentMesh: 1
+--- !u!114 &7422819589632924071
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1997598407414093240}
+  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: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 38
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4FEE"
 --- !u!1 &2867086444048306635
 GameObject:
   m_ObjectHideFlags: 0
@@ -321,7 +401,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -15.9, y: -10.6}
+  m_AnchoredPosition: {x: -15.9, y: 41.2}
   m_SizeDelta: {x: 0, y: 56}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &7928542766183595868
@@ -398,7 +478,7 @@ RectTransform:
   m_Father: {fileID: 9177955560029039243}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -470,13 +550,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 420817501019437217}
   m_Father: {fileID: 4251176618484867663}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 26.2, y: -36.5}
-  m_SizeDelta: {x: 65.5257, y: 63.5984}
+  m_AnchoredPosition: {x: 13.299988, y: -14.3}
+  m_SizeDelta: {x: 44.1113, y: 44.1113}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3703894264624883511
 CanvasRenderer:
@@ -499,7 +580,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.16470589, g: 0.52156866, b: 0.9607844, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -516,14 +597,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_ziyuan2
+  _icon_name: dec_ty_yuan
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
     packName: tongyong
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 129d2dfcaa346e2c98412e94b22ff390
+    lasetJsonGUID: c69b566b4ee58f61c7c30d14c3b8f8ab
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -555,7 +636,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6398584325073933168}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  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
@@ -622,7 +703,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3006831369699495683
 RectTransform:
   m_ObjectHideFlags: 0

+ 56 - 0
Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -553,6 +553,7 @@ GameObject:
   - component: {fileID: 2476547123357523038}
   - component: {fileID: 4787805764913935495}
   - component: {fileID: 4503408883972826744}
+  - component: {fileID: 2646849737300079892}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tenButton
@@ -679,6 +680,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2646849737300079892
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2832511953393709571}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2874684587771247412
 GameObject:
   m_ObjectHideFlags: 0
@@ -1518,6 +1532,7 @@ GameObject:
   - component: {fileID: 2971171615382265200}
   - component: {fileID: 3399192810761971074}
   - component: {fileID: 410208381731937681}
+  - component: {fileID: 9021132201883759791}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Score
@@ -1641,6 +1656,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &9021132201883759791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228470735666232042}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6320631392713871374
 GameObject:
   m_ObjectHideFlags: 0
@@ -2234,6 +2262,7 @@ GameObject:
   - component: {fileID: 8422212410502206005}
   - component: {fileID: 7583580464878605426}
   - component: {fileID: 3394084652991186606}
+  - component: {fileID: 2931040312717943506}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: oneButton
@@ -2360,6 +2389,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2931040312717943506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7228162602162805773}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &7758839808363013551
 GameObject:
   m_ObjectHideFlags: 0
@@ -2468,6 +2510,7 @@ GameObject:
   - component: {fileID: 6574333515156057038}
   - component: {fileID: 5188705645907806893}
   - component: {fileID: 8840482638861773983}
+  - component: {fileID: 2263477818664029553}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Gl
@@ -2591,6 +2634,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2263477818664029553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8763388957352667591}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9137321245016860518
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -1540,6 +1540,7 @@ GameObject:
   - component: {fileID: 751266163501733369}
   - component: {fileID: 7997018676097701127}
   - component: {fileID: 5241100393108897978}
+  - component: {fileID: 8212985562436809507}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: fanhuiButton
@@ -1665,6 +1666,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8212985562436809507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4418083923053840122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4470634333790369813
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -743,6 +743,7 @@ GameObject:
   - component: {fileID: 2934276402299459566}
   - component: {fileID: 2433990691951363383}
   - component: {fileID: 3169074378938001994}
+  - component: {fileID: 8377263828955554182}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Ok
@@ -866,6 +867,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8377263828955554182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3025038015932564937
 GameObject:
   m_ObjectHideFlags: 0
@@ -878,6 +892,7 @@ GameObject:
   - component: {fileID: 8089809648900348943}
   - component: {fileID: 6203446928090234941}
   - component: {fileID: 8494958331963905743}
+  - component: {fileID: 1285710428779438375}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Cancel
@@ -1001,6 +1016,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1285710428779438375
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3025038015932564937}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3375656862256571646
 GameObject:
   m_ObjectHideFlags: 0

+ 42 - 0
Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -14,6 +14,7 @@ GameObject:
   - component: {fileID: 1417190639178892933}
   - component: {fileID: 4712656620761187434}
   - component: {fileID: 4500398768621823800}
+  - component: {fileID: 7599276762024930445}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_DaoYou
@@ -196,6 +197,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &7599276762024930445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 384327879646792540}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &543655539214675260
 GameObject:
   m_ObjectHideFlags: 0
@@ -596,6 +610,7 @@ GameObject:
   - component: {fileID: 342810598981405438}
   - component: {fileID: 5258984480970263254}
   - component: {fileID: 2346187674936933079}
+  - component: {fileID: 1013011384258992587}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Log
@@ -719,6 +734,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1013011384258992587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1737360981415971026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2132268725135064903
 GameObject:
   m_ObjectHideFlags: 0
@@ -1884,6 +1912,7 @@ GameObject:
   - component: {fileID: 8570571649648203346}
   - component: {fileID: 4976295221266540732}
   - component: {fileID: 5349980305419514505}
+  - component: {fileID: 7303487924201986757}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ShenShi
@@ -2066,6 +2095,19 @@ MonoBehaviour:
   isScriptControl: 1
   uiToggleList: {fileID: 0}
   CustomStateController: {fileID: 0}
+--- !u!114 &7303487924201986757
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8511026840262256518
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -1295,6 +1295,7 @@ GameObject:
   - component: {fileID: 2934276402299459566}
   - component: {fileID: 2433990691951363383}
   - component: {fileID: 3169074378938001994}
+  - component: {fileID: 6564502241614664599}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Ok
@@ -1418,6 +1419,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6564502241614664599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2568419713978303985
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -291,6 +291,7 @@ GameObject:
   - component: {fileID: 8044263114105609004}
   - component: {fileID: 1571941360682940458}
   - component: {fileID: 8048933075909396369}
+  - component: {fileID: 3983431434537885405}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Go
@@ -414,6 +415,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3983431434537885405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &1856204643308014621
 GameObject:
   m_ObjectHideFlags: 0

+ 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: 

+ 48 - 200
Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 6849183701650811517}
   - component: {fileID: 731186082125369934}
   - component: {fileID: 1689730871889590423}
+  - component: {fileID: 5662111671770691226}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_DaoLv
@@ -37,8 +38,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: 298.85767, y: 40}
-  m_SizeDelta: {x: 97, y: 97}
+  m_AnchoredPosition: {x: -232, y: 234}
+  m_SizeDelta: {x: 215, y: 87}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6849183701650811517
 CanvasRenderer:
@@ -78,14 +79,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_xiulianDujie
+  _icon_name: dec_dongfu_bt_db
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
     packName: jingjie
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+    lasetJsonGUID: 0ceabf199c898c4855e75839bb2c55c4
   imageH: 97
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -135,6 +136,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5662111671770691226
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 904154690949135262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2179581233926790995
 GameObject:
   m_ObjectHideFlags: 0
@@ -173,7 +187,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -17}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4789227125964645736
 CanvasRenderer:
@@ -226,95 +240,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
---- !u!1 &2492214209734313084
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2154732167150009679}
-  - component: {fileID: 8317572491284338921}
-  - component: {fileID: 7816067844810844046}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image (2)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2154732167150009679
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2492214209734313084}
-  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: 3122246251225988632}
-  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: 748, y: -8.5}
-  m_SizeDelta: {x: 750, y: 1625}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8317572491284338921
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2492214209734313084}
-  m_CullTransparentMesh: 1
---- !u!114 &7816067844810844046
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2492214209734313084}
-  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: 21300000, guid: 5e06f09e30985d44b816eb4ba5839a99, type: 3}
-  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: bg_xiulian
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
-  packInfo:
-    packName: bg
-    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
-    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
-    lasetJsonGUID: a57bdfcd44569904ea8cd7897867d1b1
-  imageH: 1624
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &2713101091723102553
 GameObject:
   m_ObjectHideFlags: 0
@@ -327,6 +252,7 @@ GameObject:
   - component: {fileID: 9181716882316998638}
   - component: {fileID: 6053108420661588814}
   - component: {fileID: 3384885484753796925}
+  - component: {fileID: 8243756025044455815}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_XiuLian
@@ -352,8 +278,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: 212.39774, y: -98.8}
-  m_SizeDelta: {x: 97, y: 97}
+  m_AnchoredPosition: {x: 18, y: -492}
+  m_SizeDelta: {x: 215, y: 87}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9181716882316998638
 CanvasRenderer:
@@ -393,14 +319,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_xiulianDujie
+  _icon_name: dec_dongfu_bt_db
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
   packInfo:
     packName: jingjie
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
-    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+    lasetJsonGUID: 0ceabf199c898c4855e75839bb2c55c4
   imageH: 97
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -450,6 +376,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8243756025044455815
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2713101091723102553}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2878224673519074309
 GameObject:
   m_ObjectHideFlags: 0
@@ -486,8 +425,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 4.9352}
+  m_SizeDelta: {x: 0, y: -9.8704}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2175574356500699342
 CanvasRenderer:
@@ -519,7 +458,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -582,8 +521,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 5.1987}
+  m_SizeDelta: {x: 0, y: -10.3975}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8188347619997027446
 CanvasRenderer:
@@ -615,7 +554,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -677,8 +616,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: 0, y: -8.5}
-  m_SizeDelta: {x: 750, y: 1625}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 2205.5386, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4635955364539374710
 CanvasRenderer:
@@ -708,7 +647,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5e06f09e30985d44b816eb4ba5839a99, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 090a1cc878ef8cd44a08b36c7e199bd2, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -718,7 +657,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: bg_xiulian
+  _icon_name: bg_dongfu2
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 0}
   packInfo:
@@ -761,8 +700,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8212670971040085124}
-  - {fileID: 2316571660537401340}
-  - {fileID: 2154732167150009679}
   - {fileID: 2074141334421181977}
   - {fileID: 4792204723085321954}
   m_Father: {fileID: 8727043245965595146}
@@ -770,97 +707,8 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0.0022888184, y: 0}
-  m_SizeDelta: {x: 2250, y: 1608}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &7675339522409199110
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2316571660537401340}
-  - component: {fileID: 222954020009367132}
-  - component: {fileID: 7763273007402165071}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2316571660537401340
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7675339522409199110}
-  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: 3122246251225988632}
-  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: -753, y: -8.5}
-  m_SizeDelta: {x: 750, y: 1625}
+  m_SizeDelta: {x: 2205.539, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &222954020009367132
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7675339522409199110}
-  m_CullTransparentMesh: 1
---- !u!114 &7763273007402165071
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7675339522409199110}
-  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: 21300000, guid: 5e06f09e30985d44b816eb4ba5839a99, type: 3}
-  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: bg_xiulian
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
-  packInfo:
-    packName: bg
-    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
-    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
-    lasetJsonGUID: a57bdfcd44569904ea8cd7897867d1b1
-  imageH: 1624
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1479 - 264
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab


binární
Assets/Res/UI/HeroInformainPanel/修炼界面-大突破.png


binární
Assets/Res/UI/HeroInformainPanel/修炼界面-小突破成功.png


binární
Assets/Res/UI/HeroInformainPanel/修炼界面-打开丹药.png


binární
Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫-添加丹药.png


binární
Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫-添加物品.png


+ 0 - 203
Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫-添加物品.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: CXsd436qUH1pSxTuL7Cie7DHPtPN3+HjgTR/8U1zDqF5t2/lcZit29J7ZcG7
-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: 0
-  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ární
Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫.png


+ 0 - 203
Assets/Res/UI/HeroInformainPanel/修炼界面-渡劫.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: CHkfvH+pAXNcmvN3eE9Zuv0uIGIV+wdYj1VQhLHJnowHO53rlgfUl/BrmcLW
-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: 0
-  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ární
Assets/Res/UI/HeroInformainPanel/修炼界面.png


+ 0 - 203
Assets/Res/UI/HeroInformainPanel/修炼界面.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: B3JJ53z+BSh7y+jVglDHFo5OCqJGm6sUnwDcJqzcIi41wEYyEdSfuUPOmLmS
-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: 0
-  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ární
Assets/Res/UI/HeroInformainPanel/洞府-修炼.png


+ 1 - 1
Assets/Res/UI/HeroInformainPanel/修炼界面-打开丹药.png.meta → Assets/Res/UI/HeroInformainPanel/洞府-修炼.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XntOsnitBikZxNZGASSD71GRSmdsxIZwVUYRhK+4nwY8k4+BK53IzD13OJZo
+guid: DShO4yOlVip1EL7ueoSulSR+as0pxx5H/xIt2oOFbuv4J/E2WkYtBPnFi3Ns
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

binární
Assets/Res/UI/HeroInformainPanel/道侣.png


+ 0 - 203
Assets/Res/UI/HeroInformainPanel/道侣.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: Wy9JtSKvWy0dUM+Iz44VKY89C1ghOvCWadWF2o2Vw1YoM/NV20poQ/++vpf0
-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: 0
-  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: 

+ 14 - 0
Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -1615,6 +1615,7 @@ GameObject:
   - component: {fileID: 7414710902306389851}
   - component: {fileID: 2618405343744575314}
   - component: {fileID: 7353808877449382449}
+  - component: {fileID: 27451668666179327}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Go
@@ -1738,6 +1739,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &27451668666179327
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8125396639363880815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8551123114888839117
 GameObject:
   m_ObjectHideFlags: 0

+ 56 - 0
Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -2207,6 +2207,7 @@ GameObject:
   - component: {fileID: 8390928313110045558}
   - component: {fileID: 1087691984517513849}
   - component: {fileID: 4188353976954862433}
+  - component: {fileID: 2725410468052320680}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_UpGrade
@@ -2332,6 +2333,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2725410468052320680
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3908091618312269019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3931340268851502278
 GameObject:
   m_ObjectHideFlags: 0
@@ -3611,6 +3625,7 @@ GameObject:
   - component: {fileID: 781565039073399761}
   - component: {fileID: 1779521675834816083}
   - component: {fileID: 2934430960029227933}
+  - component: {fileID: 5195813603041424718}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Change
@@ -3734,6 +3749,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5195813603041424718
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6376219014674938603}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6510912021188530160
 GameObject:
   m_ObjectHideFlags: 0
@@ -4255,6 +4283,7 @@ GameObject:
   - component: {fileID: 405865854687704222}
   - component: {fileID: 8302224067188339116}
   - component: {fileID: 284704070319449970}
+  - component: {fileID: 3425143634650109716}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_PeiYang
@@ -4378,6 +4407,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3425143634650109716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7897947665373750767}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8681148993979204635
 GameObject:
   m_ObjectHideFlags: 0
@@ -4684,6 +4726,7 @@ GameObject:
   - component: {fileID: 5534412852682778287}
   - component: {fileID: 3217534402310447278}
   - component: {fileID: 7159301952731043819}
+  - component: {fileID: 7122092377375404730}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Cancel
@@ -4807,6 +4850,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7122092377375404730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9056821549282551153}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9111287373956877969
 GameObject:
   m_ObjectHideFlags: 0

+ 84 - 0
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -88,6 +88,7 @@ GameObject:
   - component: {fileID: 3771783693810167237}
   - component: {fileID: 3320536128833058962}
   - component: {fileID: 5969371070923762822}
+  - component: {fileID: 9104841837450743452}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Event
@@ -212,6 +213,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &9104841837450743452
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 454805197462043420}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &602921537856488800
 GameObject:
   m_ObjectHideFlags: 0
@@ -870,6 +884,7 @@ GameObject:
   - component: {fileID: 2833581182454625980}
   - component: {fileID: 6261009774886538096}
   - component: {fileID: 3656203349713481960}
+  - component: {fileID: 4472099066628972237}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn1_Map
@@ -995,6 +1010,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4472099066628972237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1956023067385650890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &2067316311261386271
 GameObject:
   m_ObjectHideFlags: 0
@@ -2007,6 +2035,7 @@ GameObject:
   - component: {fileID: 3509285127109723964}
   - component: {fileID: 8225963938330085936}
   - component: {fileID: 4949307884219371714}
+  - component: {fileID: 1656038444323376164}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: QianKunDai
@@ -2129,6 +2158,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &1656038444323376164
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4680823746377642281}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4927818824340999732
 GameObject:
   m_ObjectHideFlags: 0
@@ -2440,6 +2482,7 @@ GameObject:
   - component: {fileID: 6917675478362225246}
   - component: {fileID: 960266946171387090}
   - component: {fileID: 3954529720047950621}
+  - component: {fileID: 8747963378692631453}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_StartEvent
@@ -2565,6 +2608,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8747963378692631453
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5678225597687261677}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5703344219272490068
 GameObject:
   m_ObjectHideFlags: 0
@@ -2577,6 +2633,7 @@ GameObject:
   - component: {fileID: 6605159727525256171}
   - component: {fileID: 9148720037800396540}
   - component: {fileID: 637557749215430934}
+  - component: {fileID: 5703728964949210874}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Box
@@ -2699,6 +2756,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &5703728964949210874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5703344219272490068}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5936847983662490449
 GameObject:
   m_ObjectHideFlags: 0
@@ -4107,6 +4177,7 @@ GameObject:
   - component: {fileID: 8210925538578532506}
   - component: {fileID: 8753960067471709537}
   - component: {fileID: 8766683629811078357}
+  - component: {fileID: 7489813112688999977}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Daoyou
@@ -4231,6 +4302,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7489813112688999977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8816327462997807595}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8986363544919513421
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -3301,6 +3301,7 @@ GameObject:
   - component: {fileID: 8308121774079586848}
   - component: {fileID: 7967887453677892711}
   - component: {fileID: 2934063472977667771}
+  - component: {fileID: 3485659043694127256}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: oneButton
@@ -3426,6 +3427,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &3485659043694127256
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7197388528248962072}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &7321907789896462625
 GameObject:
   m_ObjectHideFlags: 0
@@ -4052,6 +4066,7 @@ GameObject:
   - component: {fileID: 4991873065644050646}
   - component: {fileID: 191353844122783110}
   - component: {fileID: 2257356165437005101}
+  - component: {fileID: 6778620985483564446}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tenButton
@@ -4178,6 +4193,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &6778620985483564446
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8467925213815132010}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8669257028166209448
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/ShopPanel/ShopBtnWidget.prefab

@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: 4461412605857524956}
   - component: {fileID: 722437814468193619}
   - component: {fileID: 9027247075650066786}
+  - component: {fileID: 6144175277733531317}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: ShopBtnWidget
@@ -227,6 +228,19 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!114 &6144175277733531317
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910660254783983298}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3624944491826870057
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
Assets/Res/UI/ShopPanel/ShopBuyItemPanel.prefab

@@ -856,6 +856,7 @@ GameObject:
   - component: {fileID: 5804626943219981259}
   - component: {fileID: 2837612809958411126}
   - component: {fileID: 5574530936304665885}
+  - component: {fileID: 6204911548440429903}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Function
@@ -979,6 +980,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &6204911548440429903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3271933524860438450}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3400556632824824613
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/ShopPanel/ShopGachaPanel.prefab

@@ -938,6 +938,7 @@ GameObject:
   - component: {fileID: 751266163501733369}
   - component: {fileID: 7997018676097701127}
   - component: {fileID: 5241100393108897978}
+  - component: {fileID: 2456884504023472445}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_ShuangBei
@@ -1063,6 +1064,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2456884504023472445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4418083923053840122}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &4588207117918255426
 GameObject:
   m_ObjectHideFlags: 0
@@ -1529,6 +1543,7 @@ GameObject:
   - component: {fileID: 1993766289997657026}
   - component: {fileID: 609131292570836846}
   - component: {fileID: 3033052995166084162}
+  - component: {fileID: 2306673733446962983}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_LingQu
@@ -1652,6 +1667,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2306673733446962983
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8247906758069621421}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8315564883920848820
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Res/UI/ShopPanel/ShopItemWidgetType1.prefab

@@ -8252,7 +8252,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 146, y: -23}
-  m_SizeDelta: {x: 182, y: 50}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7048921669090791528
 CanvasRenderer:

+ 607 - 0
Assets/Res/UI/SkillMassgePanel.prefab

@@ -0,0 +1,607 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &959975830485342132
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4480049515833029494}
+  - component: {fileID: 5048528037997048130}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: SkillMassgePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4480049515833029494
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959975830485342132}
+  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: 3960169911326494192}
+  - {fileID: 1490485299211484798}
+  - {fileID: 3849278629804045308}
+  - {fileID: 6122583032657971884}
+  - {fileID: 7480622896368215423}
+  - {fileID: 7888271529645998825}
+  m_Father: {fileID: 0}
+  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: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5048528037997048130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 959975830485342132}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: nameText
+    gameObject: {fileID: 7669451477446727280}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: massgeText
+    gameObject: {fileID: 1697194343927889744}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: guanbi
+    gameObject: {fileID: 7117935602168875445}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &2319571757915002341
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1490485299211484798}
+  - component: {fileID: 3771240254086539797}
+  - component: {fileID: 6132052890035956622}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1490485299211484798
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2319571757915002341}
+  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: 4480049515833029494}
+  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: 427, y: 244.2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3771240254086539797
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2319571757915002341}
+  m_CullTransparentMesh: 1
+--- !u!114 &6132052890035956622
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2319571757915002341}
+  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: btn_Round09
+  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
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3207348546879999267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7888271529645998825}
+  - component: {fileID: 3065997782230339610}
+  - component: {fileID: 4072185081800750322}
+  - component: {fileID: 7117935602168875445}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: guanbi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7888271529645998825
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4480049515833029494}
+  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: 177, y: 89}
+  m_SizeDelta: {x: 44, y: 44}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3065997782230339610
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_CullTransparentMesh: 1
+--- !u!114 &4072185081800750322
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.3254717, b: 0.3254717, 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: 21300000, guid: c7c98a2b50d944d2d933ad3c1f60ad39, type: 3}
+  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
+--- !u!114 &7117935602168875445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3207348546879999267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4072185081800750322}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3687039284328616005
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6122583032657971884}
+  - component: {fileID: 3878207609747309761}
+  - component: {fileID: 7669451477446727280}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: nameText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6122583032657971884
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3687039284328616005}
+  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: 4480049515833029494}
+  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: 93}
+  m_SizeDelta: {x: 458.32, y: 74.79}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3878207609747309761
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3687039284328616005}
+  m_CullTransparentMesh: 1
+--- !u!114 &7669451477446727280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3687039284328616005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &5454792456129180181
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3960169911326494192}
+  - component: {fileID: 4587643134225274661}
+  - component: {fileID: 6333405649071353888}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3960169911326494192
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454792456129180181}
+  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: 4480049515833029494}
+  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: 1000, y: 2000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4587643134225274661
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454792456129180181}
+  m_CullTransparentMesh: 1
+--- !u!114 &6333405649071353888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454792456129180181}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.59607846}
+  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
+--- !u!1 &5461590099198253036
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3849278629804045308}
+  - component: {fileID: 7681446096203755470}
+  - component: {fileID: 3105243733130640181}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3849278629804045308
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5461590099198253036}
+  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: 4480049515833029494}
+  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: 88.852}
+  m_SizeDelta: {x: 427, y: 66.495}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7681446096203755470
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5461590099198253036}
+  m_CullTransparentMesh: 1
+--- !u!114 &3105243733130640181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5461590099198253036}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9433962, g: 0.6832053, b: 0, 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: btn_Round09
+  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
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6012879202658065893
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7480622896368215423}
+  - component: {fileID: 2833182074333685423}
+  - component: {fileID: 1697194343927889744}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: massgeText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7480622896368215423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6012879202658065893}
+  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: 4480049515833029494}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -2.5, y: -22.5}
+  m_SizeDelta: {x: 389.4, y: 138.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2833182074333685423
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6012879202658065893}
+  m_CullTransparentMesh: 1
+--- !u!114 &1697194343927889744
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6012879202658065893}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New TextNew TextNew TextNew TextNew TextNew TextNew Text

+ 7 - 0
Assets/Res/UI/SkillMassgePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHMZt3mlWy68Uu6UpNxaoBIS2lHBGBbROg3HnmxyH8h6U4FxB7i8gk4vdeT3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 126 - 0
Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -934,6 +934,7 @@ GameObject:
   - component: {fileID: 6443286834363809288}
   - component: {fileID: 1911700382173267592}
   - component: {fileID: 4442566135324607271}
+  - component: {fileID: 8230082480020880759}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_ZhuDong
@@ -1118,6 +1119,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &8230082480020880759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 857437492319237345}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &877933799468505262
 GameObject:
   m_ObjectHideFlags: 0
@@ -1666,6 +1680,7 @@ GameObject:
   - component: {fileID: 8562629278153307331}
   - component: {fileID: 2772232097560558729}
   - component: {fileID: 4712953945019267583}
+  - component: {fileID: 3718944129453067507}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Tu
@@ -1788,6 +1803,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3718944129453067507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1467704899622376746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &1515688381437741579
 GameObject:
   m_ObjectHideFlags: 0
@@ -3491,6 +3519,7 @@ GameObject:
   - component: {fileID: 7918248993400424687}
   - component: {fileID: 4514347021073670849}
   - component: {fileID: 3642748124106631649}
+  - component: {fileID: 4782197136162955827}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Setting
@@ -3614,6 +3643,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4782197136162955827
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3581938487787395720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &3891518416558775222
 GameObject:
   m_ObjectHideFlags: 0
@@ -4329,6 +4371,7 @@ GameObject:
   - component: {fileID: 5668826745793188999}
   - component: {fileID: 5253754700981536788}
   - component: {fileID: 3014350990386040911}
+  - component: {fileID: 6424468551234770231}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Huo
@@ -4451,6 +4494,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6424468551234770231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5080917074618674990}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5235669251348932779
 GameObject:
   m_ObjectHideFlags: 0
@@ -4690,6 +4746,7 @@ GameObject:
   - component: {fileID: 7022963007068931577}
   - component: {fileID: 3951678519046703922}
   - component: {fileID: 8001917834383050887}
+  - component: {fileID: 2774155745813403205}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Shui
@@ -4812,6 +4869,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &2774155745813403205
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5602452155610465081}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &5808736358538801797
 GameObject:
   m_ObjectHideFlags: 0
@@ -5188,6 +5258,7 @@ GameObject:
   - component: {fileID: 137162416073161416}
   - component: {fileID: 1072359482030610864}
   - component: {fileID: 7624365524179791873}
+  - component: {fileID: 3889592042654972352}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Jin
@@ -5310,6 +5381,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3889592042654972352
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6656269987499687188}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6755705262757498291
 GameObject:
   m_ObjectHideFlags: 0
@@ -5945,6 +6029,7 @@ GameObject:
   - component: {fileID: 5122283615108105817}
   - component: {fileID: 4886873273644485354}
   - component: {fileID: 6985992140190241076}
+  - component: {fileID: 4461101014489227716}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_FuZu
@@ -6129,6 +6214,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &4461101014489227716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8090296584909710456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8282051426038164161
 GameObject:
   m_ObjectHideFlags: 0
@@ -6451,6 +6549,7 @@ GameObject:
   - component: {fileID: 255801767607311433}
   - component: {fileID: 6475446511729833954}
   - component: {fileID: 6576737988474275193}
+  - component: {fileID: 600863617369158677}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Mu
@@ -6573,6 +6672,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &600863617369158677
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8729277598116330670}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8803191321697750899
 GameObject:
   m_ObjectHideFlags: 0
@@ -6587,6 +6699,7 @@ GameObject:
   - component: {fileID: 7666637412995097434}
   - component: {fileID: 9156116810739596960}
   - component: {fileID: 8487831545810050738}
+  - component: {fileID: 3468364501085617239}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_All
@@ -6771,6 +6884,19 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &3468364501085617239
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8803191321697750899}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &8896063498617044909
 GameObject:
   m_ObjectHideFlags: 0

+ 28 - 0
Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -1834,6 +1834,7 @@ GameObject:
   - component: {fileID: 4502216836934010563}
   - component: {fileID: 3565069673636172822}
   - component: {fileID: 9099468221068453453}
+  - component: {fileID: 5661451308959653527}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Main
@@ -2004,6 +2005,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5661451308959653527
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6002680713102466570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &6175007428980403100
 GameObject:
   m_ObjectHideFlags: 0
@@ -2633,6 +2647,7 @@ GameObject:
   - component: {fileID: 4016434911845951850}
   - component: {fileID: 7637998734161463344}
   - component: {fileID: 7756643296972492655}
+  - component: {fileID: 6600563720190713741}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Event
@@ -2803,6 +2818,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6600563720190713741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8376890922099869996}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee153b56bb1344658ab006fd073af3d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  audioName: ui_button
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0

+ 6 - 1
Assets/Res/UIAtlas/jingjie.spriteatlasv2

@@ -14,6 +14,8 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 5b91e59ce861d494ea8b67a0cc5ea6d1, type: 3}
     - {fileID: 2800000, guid: 1d5a91f3dc61e7b4ba925d1cadf5fa26, type: 3}
     - {fileID: 2800000, guid: 793519e41c1d2fb4f9922921db6b38cf, type: 3}
+    - {fileID: 2800000, guid: aff87aaebe6d370418aed5f2f00f06e8, type: 3}
+    - {fileID: 2800000, guid: 33f9054fc04e71642a7a27c79cad7175, type: 3}
     - {fileID: 2800000, guid: d24d06673ce34404b99a7fad7b7313e6, type: 3}
     - {fileID: 2800000, guid: 257e4992752d407409e07c998bf44ab9, type: 3}
     - {fileID: 2800000, guid: 7fde93c4c9677fc459b20d0505c9613f, type: 3}
@@ -21,6 +23,10 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: e7f510bac64dd9948b8a8361278c8c73, type: 3}
     - {fileID: 2800000, guid: 0a259baf419491649953de74814af760, type: 3}
     - {fileID: 2800000, guid: f007ef230cded9d45b2f36f9d1d9ac22, type: 3}
+    - {fileID: 2800000, guid: 5b2a1517333000d478b80002584cd319, type: 3}
+    - {fileID: 2800000, guid: 2163262df9284a74f9b5dc7dbf8718be, type: 3}
+    - {fileID: 2800000, guid: c3d914222260cfd458cba8e41bf70166, type: 3}
+    - {fileID: 2800000, guid: 3afed221e87e81941afbd8ee70a6444d, type: 3}
     - {fileID: 2800000, guid: 24e31eb2fcc012f409a51a9bf745be8f, type: 3}
     - {fileID: 2800000, guid: b4ac1bb52f9d07540a89afcb37e6844f, type: 3}
     - {fileID: 2800000, guid: fd5def411aa419c4f8d6a32c6537d435, type: 3}
@@ -29,7 +35,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: c8478e1bbe447994abea811ae6b624aa, type: 3}
     - {fileID: 2800000, guid: 3c71674d335273742b8ae32a2ef31c29, type: 3}
     - {fileID: 2800000, guid: 4ab999f125cbfe74da2d527a06b2e5aa, type: 3}
-    - {fileID: 2800000, guid: c4ff969aee2d5b64281061b5d5f509a0, type: 3}
     - {fileID: 2800000, guid: b654347307de42645a83773009a5cd86, type: 3}
     - {fileID: 2800000, guid: fdc0f601c5d531f4995c985e6a3288f7, type: 3}
     - {fileID: 2800000, guid: ad291dcd3377d1449b67d1d067dab327, type: 3}

+ 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}

+ 1 - 1
Assets/Scripts/Core/Audio/AudioButton.cs

@@ -9,7 +9,7 @@ namespace Core.Audio
 
         public void OnPointerUp(PointerEventData eventData)
         {
-            AudioManager.Instance.Play(audioName, false);
+            AudioManager.Instance.Play(audioName+".ogg", false);
         }
     }
 }

+ 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();
+    
         }
     }
 }

+ 3 - 1
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -50,6 +51,7 @@ namespace Fort23.Mono
             Btn_Back.onClick.AddListener(() =>
             {
                 UIManager.Instance.HideUIUIPanel(currentOpenUIPanel);
+                AudioManager.Instance.PlayAudio("ui_fanhui.wav");
                 // currentOpenUIPanel = null;
             });
             Btn_Menu.onClick.AddListener(async () =>
@@ -184,7 +186,7 @@ namespace Fort23.Mono
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
-
+            AudioManager.Instance.PlayAudio("ui_shengshitansuo.wav");
             if(PlayerGuideManager.Instance.curPhase == 2)  
                 PlayerGuideManager.Instance.StepInit();
             if(PlayerGuideManager.Instance.curPhase == 3)  

+ 5 - 0
Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Audio;
 using Fort23.Core;
 using Mono.Utility;
 
@@ -37,8 +38,10 @@ namespace Fort23.Mono
         public async void CustomInit(bool isWin, System.Action callBack)
         {
             this.callBack = callBack;
+            AudioManager.Instance.PauseBGM();
             if (isWin)
             {
+                AudioManager.Instance.PlayAudio("combat_win.wav");
                 WinRoot.SetActive(true);
                 FailRoot.SetActive(false);
                 // f
@@ -47,6 +50,7 @@ namespace Fort23.Mono
             }
             else
             {
+                AudioManager.Instance.PlayAudio("shibai.wav");
                 WinRoot.SetActive(false);
                 FailRoot.SetActive(true);
 
@@ -78,6 +82,7 @@ namespace Fort23.Mono
 
         public override void Close()
         {
+            AudioManager.Instance.UnPauseBGM();
             foreach (var skipToWidget in skipToWidgets)
             {
                 UIManager.Instance.DormancyGComponent(skipToWidget);

+ 2 - 0
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Audio;
 using Core.Language;
 using Core.Utility;
 using Excel2Json;
@@ -138,6 +139,7 @@ namespace Fort23.Mono
 
         private void CloseButtonCallBack()
         {
+            AudioManager.Instance.PlayAudio("ui_fanhui.wav");
             UIManager.Instance.HideUIUIPanel(this);
 
             EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, null);

+ 2 - 0
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -227,6 +227,8 @@ namespace Fort23.Mono
                 // await TimerComponent.Instance.WaitAsync(300);
                 gachaPanel.CusstomInit();
             }
+            
+            AudioManager.Instance.PlayAudio("ui_chouqugongfa.wav");
         }
     }
 }

+ 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];

+ 41 - 40
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -54,6 +55,7 @@ namespace Fort23.Mono
                 AppBarPanel.ClosePanel();
             }
 
+            TitlePanel.ClosePanel();
             // AppBarPanel.OpenPanel(this);
             await base.GetFocus();
         }
@@ -338,6 +340,8 @@ namespace Fort23.Mono
                 {
                     // UIManager.Instance.HideUIUIPanel(this);
                 }
+
+                AudioManager.Instance.PlayAudio("ui_fanhui.wav");
             });
             Btn_RemoveGongFa.onClick.AddListener(() =>
             {
@@ -350,6 +354,7 @@ namespace Fort23.Mono
                 BaoChun();
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
+                AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
             });
 
             Sv.onValueChanged.AddListener((s) =>
@@ -635,34 +640,25 @@ namespace Fort23.Mono
 
                 skillKongWidget.SetSKill(selectSkillConfig);
                 allUseSkill[skillKongWidget.index] = selectSkillConfig;
+                if (selectSkillConfig.skillConfig.SkillType == 1)
+                {
+                    AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                }
+                else if (selectSkillConfig.skillConfig.SkillType == 2)
+                {
+                    AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                }
+
                 CloseSelect();
                 BaoChun();
 
+
                 showSkillInfo.Sort(Sort);
                 Content.Init(this, showSkillInfo.Count);
             }
             //替换功法
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
             {
-                // if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 1)
-                // {
-                //     if (!IsMainGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
-                //
-                // if (allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType == 2)
-                // {
-                //     if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) && allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
                 if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) &&
                     allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
                 {
@@ -679,32 +675,21 @@ namespace Fort23.Mono
                     return;
                 }
 
-                // if (selectSkillConfig.skillConfig.SkillType == 1)
-                // {
-                //     if (!IsMainGongFaChange(selectSkillConfig.skillConfig))
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
-                //
-                // if (selectSkillConfig.skillConfig.SkillType == 2)
-                // {
-                //     if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig))
-                //     {
-                //         TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
-                //         CloseSelect();
-                //         return;
-                //     }
-                // }
-
 
                 isAlter = true;
                 allUseSkill[skillKongWidget.SkillInfo.index] = null;
                 skillKongWidget.SetSKill(selectSkillConfig);
                 allUseSkill[skillKongWidget.index] = selectSkillConfig;
                 skillKongWidget.SetSKill(selectSkillConfig);
+                if (selectSkillConfig.skillConfig.SkillType == 1)
+                {
+                    AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                }
+                else if (selectSkillConfig.skillConfig.SkillType == 2)
+                {
+                    AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                }
+
                 CloseSelect();
                 BaoChun();
                 showSkillInfo.Sort(Sort);
@@ -728,7 +713,14 @@ namespace Fort23.Mono
                     Btn_Info.transform.position = dianjiSkillKongWidget.InfoPos.position;
                     Btn_Info.gameObject.SetActive(true);
                     SelectSkill(skillKongWidget.SkillInfo, false, false);
-                    // BaoChun();
+                    // if (skillKongWidget.SkillInfo.skillConfig.SkillType == 1)
+                    // {
+                    //     AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                    // }
+                    // else if (skillKongWidget.SkillInfo.skillConfig.SkillType == 2)
+                    // {
+                    //     AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                    // }
                 }
                 else
                 {
@@ -747,6 +739,15 @@ namespace Fort23.Mono
 
                     skillKongWidget.SetSKill(selectSkillConfig);
                     allUseSkill[skillKongWidget.index] = selectSkillConfig;
+                    if (selectSkillConfig.skillConfig.SkillType == 1)
+                    {
+                        AudioManager.Instance.PlayAudio("ui_xiazhenggongfa.wav");
+                    }
+                    else if (selectSkillConfig.skillConfig.SkillType == 2)
+                    {
+                        AudioManager.Instance.PlayAudio("ui_fzgf_yx.wav");
+                    }
+
                     CloseSelect();
                     BaoChun();
                 }

+ 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>
         /// 设置文本大小

+ 1 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/CaveMainPanel.cs

@@ -40,6 +40,7 @@ namespace Fort23.Mono
 		public override CTask GetFocus()
 		{
 			AppBarPanel.OpenPanel(this);
+			TitlePanel.ClosePanel();
 			return base.GetFocus();
 		}
 		

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů