Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Assets/Scenes/testCombat.scene   resolved by master version
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version
DESKTOP-BGJIU14\ck 1 deň pred
rodič
commit
ce9862a1a7
100 zmenil súbory, kde vykonal 10972 pridanie a 3825 odobranie
  1. BIN
      Assets/Art/Environment/360Textures/yj_shan1.png
  2. 8 78
      Assets/Art/Environment/360Textures/yj_shan1.png.meta
  3. BIN
      Assets/Art/Environment/360Textures/yj_shan2.png
  4. 133 0
      Assets/Art/Environment/360Textures/yj_shan2.png.meta
  5. 2 48
      Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle01.mat
  6. 0 0
      Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle01.mat.meta
  7. 2 2
      Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle02.mat
  8. 0 0
      Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle02.mat.meta
  9. 90 0
      Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle03.mat
  10. 8 0
      Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle03.mat.meta
  11. 35 0
      Assets/Art/Environment/shader/yj_LevelBattle01.mat
  12. 8 0
      Assets/Art/Environment/shader/yj_LevelBattle01.mat.meta
  13. 35 0
      Assets/Art/Environment/shader/yj_LevelBattle02.mat
  14. 8 0
      Assets/Art/Environment/shader/yj_LevelBattle02.mat.meta
  15. 35 0
      Assets/Art/Environment/shader/yj_LevelBattle03.mat
  16. 8 0
      Assets/Art/Environment/shader/yj_LevelBattle03.mat.meta
  17. 35 0
      Assets/Art/Environment/shader/yj_shan1.mat
  18. 8 0
      Assets/Art/Environment/shader/yj_shan1.mat.meta
  19. 0 0
      Assets/Art/UIAssets/TextrueJson/bg.txt
  20. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  21. BIN
      Assets/Art/UIAssets/bg/bg_lh_wanxi.png
  22. 3 3
      Assets/Art/UIAssets/bg/bg_lh_wanxi.png.meta
  23. 2 2
      Assets/Art/UIAssets/decorate/dec_juxing16_miaobian2.png.meta
  24. BIN
      Assets/Art/UIAssets/decorate/dec_juxing_miaobian3.png
  25. 5 75
      Assets/Art/UIAssets/decorate/dec_juxing_miaobian3.png.meta
  26. BIN
      Assets/Art/UIAssets/decorate/dec_tupochenggong.png
  27. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat
  28. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat
  29. 2 2
      Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat
  30. 377 0
      Assets/Art/VFX/preview_timeline/tupo cg.playable
  31. 8 0
      Assets/Art/VFX/preview_timeline/tupo cg.playable.meta
  32. 421 636
      Assets/Art/cs3.scene
  33. 52 66
      Assets/Res/Aduio/MainAudio.asset
  34. 145 9
      Assets/Res/CombatScenes/LevelBattle01.prefab
  35. 38 87
      Assets/Res/CombatScenes/LevelBattle02.prefab
  36. 10 98
      Assets/Res/CombatScenes/LevelBattle03.prefab
  37. 25 25
      Assets/Res/Config/DropGroupConfig.json
  38. 12 12
      Assets/Res/Config/DropItemConfig.json
  39. 1 1
      Assets/Res/Config/EventConditionConfig.json
  40. 147 161
      Assets/Res/Config/EventConfig.json
  41. 125 127
      Assets/Res/Config/EventLinkConfig.json
  42. 1 1
      Assets/Res/Config/EventNPC.json
  43. 115 115
      Assets/Res/Config/FabaoPowerupConfig.json
  44. 28 28
      Assets/Res/Config/GroupConfig.json
  45. 2 2
      Assets/Res/Config/HeroModelConfig.json
  46. 114 114
      Assets/Res/Config/HeroPowerUpConfig.json
  47. 28 28
      Assets/Res/Config/ItemConfig.json
  48. 753 753
      Assets/Res/Config/LanguageChineseConfig.json
  49. 156 156
      Assets/Res/Config/LanguageChineseConfig_skill.json
  50. 288 288
      Assets/Res/Config/MonsterPowerUpConfig.json
  51. 22 22
      Assets/Res/Config/PlayerGuideConfig.json
  52. 182 182
      Assets/Res/Config/ResourceLevelConfig.json
  53. 161 161
      Assets/Res/Config/SentimentEffectConfig.json
  54. 4 1
      Assets/Res/Config/SkillConfig.json
  55. 7 7
      Assets/Res/Config/SkillConstant.json
  56. 112 112
      Assets/Res/Config/SkillPowerupConfig.json
  57. 100 100
      Assets/Res/Config/TowerInfoConfig.json
  58. 12 12
      Assets/Res/UI/BackgroundPanel/open.anim
  59. 61 61
      Assets/Res/UI/BoxPanel/GachaPanel.prefab
  60. 26 26
      Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab
  61. 12 12
      Assets/Res/UI/CombatPanel.prefab
  62. 4 4
      Assets/Res/UI/DivineSence/BossInfoPanel.prefab
  63. 123 6
      Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab
  64. 218 0
      Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab
  65. 2 2
      Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab.meta
  66. 1 1
      Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab
  67. 553 5
      Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab
  68. 7 7
      Assets/Res/UI/DivineSence/SkipToWidget.prefab
  69. BIN
      Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png
  70. BIN
      Assets/Res/UI/DivineSence/战斗界面-战前信息1.png
  71. BIN
      Assets/Res/UI/DivineSence/战斗界面-战前详情.png
  72. 6 6
      Assets/Res/UI/GuidePanel/GuidePanel.prefab
  73. 72 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller
  74. 8 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller.meta
  75. 320 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim
  76. 8 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim.meta
  77. 10 10
      Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab
  78. 3 3
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab
  79. 5 5
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab
  80. 4907 2
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab
  81. 14 13
      Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab
  82. 7 7
      Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab
  83. 4 4
      Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab
  84. 72 9
      Assets/Res/UI/ItemDetailsPanel/ItemSourcePanel.prefab
  85. 50 14
      Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab
  86. 1 1
      Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab
  87. 34 2
      Assets/Res/UI/MainPanel/MainPanel.prefab
  88. 69 10
      Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab
  89. 73 14
      Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab
  90. 12 11
      Assets/Res/UI/ShopPanel/DaiJinJuanWidget.prefab
  91. 40 38
      Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab
  92. 18 18
      Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab
  93. 1 1
      Assets/Res/UI/ShopPanel/ShopPanel.prefab
  94. 5 5
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab
  95. 8 8
      Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab
  96. 251 0
      Assets/Res/UI/UIanima/UIanimaKzOpen.anim
  97. 8 0
      Assets/Res/UI/UIanima/UIanimaKzOpen.anim.meta
  98. 72 0
      Assets/Res/UI/UIanima/UIanimaScale1.controller
  99. 8 0
      Assets/Res/UI/UIanima/UIanimaScale1.controller.meta
  100. 4 4
      Assets/Res/UI/WidgetItem.prefab

BIN
Assets/Art/Environment/360Textures/yj_shan1.png


+ 8 - 78
Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png.meta → Assets/Art/Environment/360Textures/yj_shan1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XX5N5yKsW34vJwuZBPso/zkrfCz2+6cCh5dTYfU/gB7yrG5Gd0thYhhIS34w
+guid: CihJ4SOrVnPdQeIITvnVRWPHvuPJqsMf5PAXO4CUeK69e7T2XLEwDbtMJjFM
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -40,13 +40,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
+    wrapU: 0
+    wrapV: 0
     wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -57,7 +57,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -112,83 +112,13 @@ TextureImporter:
     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
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 
@@ -199,5 +129,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u4E3B\u754C\u9762-\u795E\u8BC6-\u795E\u8BC6\u6062\u590D\u5F39\u7A97"
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Art/Environment/360Textures/yj_shan2.png


+ 133 - 0
Assets/Art/Environment/360Textures/yj_shan2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CnhM43v8AXLAsA3JZWE+SjKCvBO/97SdFnEt1wCoUgL9qEDG6cG5622M5bV9
+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: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 48
Assets/Art/Environment/Sky/Clouds/tiankong02.mat → Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle01.mat

@@ -7,8 +7,8 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: tiankong02
-  m_Shader: {fileID: 4800000, guid: 54e59f65585b87c479bfb75710b91a47, type: 3}
+  m_Name: tiankongLevelBattle01
+  m_Shader: {fileID: 4800000, guid: 5d87fa370d4d0bd48bd6506f96ad47a7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
@@ -51,14 +51,6 @@ Material:
         m_Texture: {fileID: 2800000, guid: f8317325c1c3eb945a0fa35dfcf2de31, type: 3}
         m_Scale: {x: 3, y: 2}
         m_Offset: {x: 0.65, y: 0.03}
-    - _Main_Tex:
-        m_Texture: {fileID: 2800000, guid: f8317325c1c3eb945a0fa35dfcf2de31, type: 3}
-        m_Scale: {x: 1, y: 2}
-        m_Offset: {x: 0, y: 0.09}
-    - _Mask:
-        m_Texture: {fileID: 2800000, guid: fc22f6ee15890544eb128ed36ae8e9a6, type: 3}
-        m_Scale: {x: 1, y: 2}
-        m_Offset: {x: 0, y: -0.01}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -71,66 +63,28 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    - _Turb_Noise:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _dissolve:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
     - _AMultiplier: 0.8
-    - _Alpha: 1
-    - _AlphaCutoff: 0.5
     - _BumpScale: 1
-    - _CTime: 1
-    - _CustomDataDissolve: 0
-    - _CustomDataMainUV: 0
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
-    - _Diss_value: 0
     - _DstBlend: 0
     - _Glossiness: 0.5
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _QueueControl: 0
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
     - _Scroll2X: 1
     - _Scroll2Y: 0
     - _ScrollX: 0
     - _ScrollY: 0
-    - _Soft_value: 0
     - _SrcBlend: 1
     - _Tiling: 1
-    - _Turb_Value: 0
     - _UVSec: 0
     - _ZWrite: 1
-    - _ca: 1
-    - _light: 1
     m_Colors:
     - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
     - _ColorTint: {r: 0.908, g: 0.9643004, b: 1, a: 1}
-    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _Main_Color: {r: 1, g: 1, b: 1, a: 1}
-    - _Main_UV: {r: 0.001, g: 0, b: 0, a: 0}
-    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
-    - _Turb_UV: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

+ 0 - 0
Assets/Art/Environment/Sky/Clouds/tiankong02.mat.meta → Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle01.mat.meta


+ 2 - 2
Assets/Art/Environment/Sky/Clouds/tiankong01.mat → Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle02.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: tiankong01
+  m_Name: tiankongLevelBattle02
   m_Shader: {fileID: 4800000, guid: 5d87fa370d4d0bd48bd6506f96ad47a7, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
@@ -48,7 +48,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: f8317325c1c3eb945a0fa35dfcf2de31, type: 3}
+        m_Texture: {fileID: 2800000, guid: 5fba08ba1be4e2749862eae0ce02e359, type: 3}
         m_Scale: {x: 3, y: 2}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

+ 0 - 0
Assets/Art/Environment/Sky/Clouds/tiankong01.mat.meta → Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle02.mat.meta


+ 90 - 0
Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle03.mat

@@ -0,0 +1,90 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: tiankongLevelBattle03
+  m_Shader: {fileID: 4800000, guid: 5d87fa370d4d0bd48bd6506f96ad47a7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 97e6ae0b7e635ee48aa02165170dd44d, type: 3}
+        m_Scale: {x: 3, y: 2}
+        m_Offset: {x: 0, y: -0.04}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AMultiplier: 0.8
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Glossiness: 0.5
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Scroll2X: 1
+    - _Scroll2Y: 0
+    - _ScrollX: 0.03
+    - _ScrollY: 0
+    - _SrcBlend: 1
+    - _Tiling: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.588, g: 0.588, b: 0.588, a: 1}
+    - _ColorTint: {r: 0.908, g: 0.9643004, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/Environment/Sky/Clouds/tiankongLevelBattle03.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DitK4SP5W3OtsrP2+mzmPlj49i9ALxnII4Xc325EK9uzc9VlMt2l7UyWK3ii
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 35 - 0
Assets/Art/Environment/shader/yj_LevelBattle01.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_LevelBattle01
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 52cfaab97c530194eb8448f57225e214, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.25311485, g: 0.58406645, b: 0.7452829, a: 0.49411765}
+    - _TilingCustom: {r: 5.09, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/Environment/shader/yj_LevelBattle01.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DCwXvXurVnzrgCl38APfTiuIE3zKDZgHM37Tp6E1Eoedf+YM+bHNLTe3x0TP
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 35 - 0
Assets/Art/Environment/shader/yj_LevelBattle02.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_LevelBattle02
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 52cfaab97c530194eb8448f57225e214, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.21929498, g: 0.55338323, b: 0.7264149, a: 0.8352941}
+    - _TilingCustom: {r: 5, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/Environment/shader/yj_LevelBattle02.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BnsYsiilUXL1lbp8Ig/V+3bttB44V/VWGAZDR6x0paWWx76jqCOoQcKgZD7o
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 35 - 0
Assets/Art/Environment/shader/yj_LevelBattle03.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_LevelBattle03
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 52cfaab97c530194eb8448f57225e214, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.8160376, g: 0.45429054, b: 0.33873248, a: 0.6509804}
+    - _TilingCustom: {r: 5, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/Environment/shader/yj_LevelBattle03.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DiwW5yOtVS7+Ku02JHCYFvLRCfbLIs928jK+wqIMIUuHnIloB2xjhXyXVgoD
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 35 - 0
Assets/Art/Environment/shader/yj_shan1.mat

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: yj_shan1
+  m_Shader: {fileID: 4800000, guid: b53bf3c118b453340a7165e3b9fe15b3, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 5bfd96589af924f40a151971972f41ce, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.8301885, g: 0.64556396, b: 0.5873975, a: 0.7647059}
+    - _TilingCustom: {r: 1, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/Environment/shader/yj_shan1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bn8a4H6rByozL2JvM++sbtqGZTt3YKhsz5BNsD9LBHISKE3R/VQxbqwrQ7Ti
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/bg.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


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


+ 3 - 3
Assets/Res/UI/DivineSence/战斗界面-战前详情.png.meta → Assets/Art/UIAssets/bg/bg_lh_wanxi.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WS4Y4H+uBn13DxP08NQQ/j8xB5t4CGNGGsZH+HmDTl7baK5qbfvCR1c8wAXs
+guid: XXgXsyKrVXvJjui2LF6DiMWY99VUDUxw76QvZ94RBnDwGAzrBUjHitcNzmp2
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u6218\u6597\u754C\u9762-\u6218\u524D\u8BE6\u60C5"
+  assetBundleName: 
   assetBundleVariant: 

+ 2 - 2
Assets/Art/UIAssets/decorate/dec_juxing16_miaobian2.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 16, y: 18, z: 19, w: 18}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -189,7 +189,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

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


+ 5 - 75
Assets/Res/UI/DivineSence/战斗界面-战前信息1.png.meta → Assets/Art/UIAssets/decorate/dec_juxing_miaobian3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: BygcvSj/BimU6Clmp/JP+2gIDDm5vdqV3dwBE4ufjvUHDMObVyytFbMrHIG9
+guid: Wnsas3ytUC6zTn+dM0KflRTwrNeC2W+lexAN+/AMdNBbAIQqQ4AMSf2E/OaI
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 3, y: 3, z: 3, w: 3}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -112,76 +112,6 @@ TextureImporter:
     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: []
@@ -189,7 +119,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []
@@ -199,5 +129,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u6218\u6597\u754C\u9762-\u6218\u524D\u4FE1\u606F1"
+  assetBundleName: 
   assetBundleVariant: 

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


+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.7652023
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.57886076
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.20774812
+    - _Alpha: 0.009973586
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20282054
+    - _MainTexOffsetU: 0.55235326
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

+ 377 - 0
Assets/Art/VFX/preview_timeline/tupo cg.playable

@@ -0,0 +1,377 @@
+%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: bfda56da833e2384a9677cd3c976a436, type: 3}
+  m_Name: tupo cg
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks:
+  - {fileID: 1624797632644883041}
+  - {fileID: 3646687833228186186}
+  - {fileID: 4663933653112516609}
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}
+--- !u!114 &1624797632644883041
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 5200548305377118897}
+    m_Duration: 0.2
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 1624797632644883041}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0
+    m_DisplayName: HeroBreakthroughSuccessPanelopen
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &2379966987202395476
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
+--- !u!114 &3646687833228186186
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 2379966987202395476}
+    m_Duration: 1
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 3646687833228186186}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
+--- !u!114 &4663933653112516609
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 15e0374501f39d54eb30235764636e0e, type: 3}
+  m_Name: Control Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 8663316340780246052}
+    m_Duration: 5
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 4663933653112516609}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: fx_ui_tupo_chenggong
+  m_Markers:
+    m_Objects: []
+--- !u!114 &5200548305377118897
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+  m_Name: AnimationPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 7400000, guid: 4ed9721fa51d34b41841f47cd38936c1, type: 2}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &8663316340780246052
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 48853ae485fa386428341ac1ea122570, type: 3}
+  m_Name: ControlPlayableAsset
+  m_EditorClassIdentifier: 
+  sourceGameObject:
+    exposedName: 423c4f55b92fcb145bb9fcde9e7bbe37
+    defaultValue: {fileID: 0}
+  prefabGameObject: {fileID: 0}
+  updateParticle: 1
+  particleRandomSeed: 1384
+  updateDirector: 1
+  updateITimeControl: 1
+  searchHierarchy: 1
+  active: 1
+  postPlayback: 2

+ 8 - 0
Assets/Art/VFX/preview_timeline/tupo cg.playable.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W3gb536vBS4bqPyhYd7FTQHT5efBbWdfdKCs1GNt5hl3jC+cTknHHzoKeFbm
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 421 - 636
Assets/Art/cs3.scene


+ 52 - 66
Assets/Res/Aduio/MainAudio.asset

@@ -275,69 +275,55 @@ MonoBehaviour:
   - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
     audionClipName: 9102_shifa2.wav
     volume: 1
-  AudioClips:
-  - {fileID: 8300000, guid: c9f9547d4305cc6409ea3347cbfac03f, type: 3}
-  - {fileID: 8300000, guid: 3650c793b36bec049be0e22040784775, type: 3}
-  - {fileID: 8300000, guid: 6a0389d19e064f74498d3ca891d55b4c, type: 3}
-  - {fileID: 8300000, guid: cd53b62009333504591524410c8689da, type: 3}
-  - {fileID: 8300000, guid: acf5b85e087dd5e4c8f9d4e7500eed82, type: 3}
-  - {fileID: 8300000, guid: 9538a3a5ec0d21c46b71a68ca7e63bbb, type: 3}
-  - {fileID: 8300000, guid: 42c7642fd30e35142be62ddedbe2689e, type: 3}
-  - {fileID: 8300000, guid: 9bd0dc0d548970a4a85bdb198c50cbb6, type: 3}
-  - {fileID: 8300000, guid: b57ff80856ac08a40b7b8e4074d5c9a1, type: 3}
-  - {fileID: 8300000, guid: 94408c3f2016a1c4d8d60cc1dc539fdd, type: 3}
-  - {fileID: 8300000, guid: bcd41dffeb9b30d47a001e5ee79998ab, type: 3}
-  - {fileID: 8300000, guid: 6423bfa272d1bf441b46d3f50e35bbff, type: 3}
-  - {fileID: 8300000, guid: 8e8deb59c557d16478c27ec2a0ac7fb5, type: 3}
-  - {fileID: 8300000, guid: d8f2a00dd46b6c14eb5b39ecff6522b5, type: 3}
-  - {fileID: 8300000, guid: 1516ed24b64ff5948a8779a94fdb6614, type: 3}
-  - {fileID: 8300000, guid: 14b87bf16e903bf48b933e4a65821624, type: 3}
-  - {fileID: 8300000, guid: 939800140ba53554c962da73e9458e99, type: 3}
-  - {fileID: 8300000, guid: e368096480221ab4a9fbf02eaeff8bcd, type: 3}
-  - {fileID: 8300000, guid: 353f1d3372347a24f9fa1fec6e657e5b, type: 3}
-  - {fileID: 8300000, guid: a6e9c16b9c72d9b4498f0ebc4e4720b4, type: 3}
-  - {fileID: 8300000, guid: 7867719b3bd0dfc468754860f3e9d1ba, type: 3}
-  - {fileID: 8300000, guid: 62a5eb87200cfc44baed79fb8073c9b9, type: 3}
-  - {fileID: 8300000, guid: 33df1eefc7e82e540a3cd9b69f2cbbb3, type: 3}
-  - {fileID: 8300000, guid: bcf6ba16dbd63e141a0481df8b33a9f1, type: 3}
-  - {fileID: 8300000, guid: 1375b46eb5ff33646a5d1f9dc7ef522f, type: 3}
-  - {fileID: 8300000, guid: 5c7399139f71fa742b8608ae5122aea1, type: 3}
-  - {fileID: 8300000, guid: 618ca714d2e3165499e7c484cacb0691, type: 3}
-  - {fileID: 8300000, guid: 62acbf10dc843044597bf8b61da4a286, type: 3}
-  - {fileID: 8300000, guid: 5ad2ab96fa03bb543864521e5b00e54d, type: 3}
-  - {fileID: 8300000, guid: eeacf752c41d983418c08937589df870, type: 3}
-  - {fileID: 8300000, guid: 3a85aa4c0a10b0846a6a547551d5cebd, type: 3}
-  - {fileID: 8300000, guid: 8f7591f8d2187334b95a8ee3cae94277, type: 3}
-  - {fileID: 8300000, guid: e4b92507c1b2e994b9d7adc11307ff2f, type: 3}
-  - {fileID: 8300000, guid: 75fa790f5fae9184891d197333b30bd9, type: 3}
-  - {fileID: 8300000, guid: 8e1f8c7b8b13f9d4e9f4b892161f65fa, type: 3}
-  - {fileID: 8300000, guid: 3369087d800c6dd478de6062f2145b34, type: 3}
-  - {fileID: 8300000, guid: 38e82475ae4867d4b8c05c24a5611f7d, type: 3}
-  - {fileID: 8300000, guid: 703f61a21633b4b42b203b8d18abdd0a, type: 3}
-  - {fileID: 8300000, guid: 169db9db1006f6c47bf69ae9f00c9f54, type: 3}
-  - {fileID: 8300000, guid: fe04c798d9e08394c9fbdae45416a970, type: 3}
-  - {fileID: 8300000, guid: 4f699fe96c0becb4f8ed7d50fe6cb80d, type: 3}
-  - {fileID: 8300000, guid: 2a1c302b3b0225241b2a98077bc9fb4c, type: 3}
-  - {fileID: 8300000, guid: 3ea3e5db60677d645a66d4a290f40643, type: 3}
-  - {fileID: 8300000, guid: 618f3ba353cb3b94f91b24d572a0ce44, type: 3}
-  - {fileID: 8300000, guid: b5caa44de7925354aaaf1f31101c525f, type: 3}
-  - {fileID: 8300000, guid: dd8e187f03a383e458871c93d58fa220, type: 3}
-  - {fileID: 8300000, guid: ef5c78084bd6d1e4e940063217d38a13, type: 3}
-  - {fileID: 8300000, guid: 890c54a3fd4750d40ac44e9ef8e4f033, type: 3}
-  - {fileID: 8300000, guid: c378b74a45ce90449b8c04bea2cde87c, type: 3}
-  - {fileID: 8300000, guid: 5624e01fab677e34fbbcb8a7a3969170, type: 3}
-  - {fileID: 8300000, guid: e9c30207a36a0f14492d1c3176a0ccf7, type: 3}
-  - {fileID: 8300000, guid: 5122ba1b585db4846814a1fe7a6871ab, type: 3}
-  - {fileID: 8300000, guid: 4a87ca2f651798447bd549c4fa392288, type: 3}
-  - {fileID: 8300000, guid: 9516f124a2dd294429ebf22a81ae0428, type: 3}
-  - {fileID: 8300000, guid: fe16e30243d152440b3855487918a5b6, type: 3}
-  - {fileID: 8300000, guid: 4ec8325700be95742b15e731743cfa99, type: 3}
-  - {fileID: 8300000, guid: 6753f88115e820a49bbfa0ecc027a0b6, type: 3}
-  - {fileID: 8300000, guid: 10ec998f3323fe64d96baeeb2c142e30, type: 3}
-  - {fileID: 8300000, guid: 7d0d13ead59288247be92922d9a1faee, type: 3}
-  - {fileID: 8300000, guid: 6e4156ec73d819e4a8e0236900bebfbc, type: 3}
-  - {fileID: 8300000, guid: 5a6908e1cd9fef74d92d860be71e6779, type: 3}
-  - {fileID: 8300000, guid: 63d8773218ee0374f9f09f4829f00849, type: 3}
-  - {fileID: 8300000, guid: dc6cdb952c673cb40aa5b7096e04672c, type: 3}
-  - {fileID: 8300000, guid: 6068f4e607032504ba7125f96f576bce, type: 3}
-  - {fileID: 8300000, guid: a8ead8e782f8d6f4aaa3bafa38ab9ec9, type: 3}
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: chuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fabaochuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fabaohit.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10002gj.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10003cixu.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10004chuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10004hit.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10007shengxiao.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10008chixu.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10008loop.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10010chixu.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_10010chuxian.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_duiping.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_duipingbaozha.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_feixing.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: fb_xiaopengzhuang.wav
+    volume: 1
+  - describe: "\u63CF\u8FF0\u8FD9\u4E2A\u97F3\u6548\u4F5C\u7528"
+    audionClipName: ui_button.ogg
+    volume: 1
+  AudioClips: []

+ 145 - 9
Assets/Res/CombatScenes/LevelBattle01.prefab

@@ -48,13 +48,100 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   skyObejct: {fileID: 4787834087060179975}
   fogColor: {r: 0.26950002, g: 0.3349501, b: 0.55, a: 1}
-  fogStartDistance: 10
-  fogEndDistance: 50
+  fogStartDistance: 80
+  fogEndDistance: 150
   allObject:
   - {fileID: 354955946429195138, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
   - {fileID: 8855316551847403815, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
   - {fileID: 8291995275029873607, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
-  radius: 35
+  radius: 45
+--- !u!1 &2814510134427997610
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 642287652830482507}
+  - component: {fileID: 4680905504009489264}
+  - component: {fileID: 2877345063359395945}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SkyDome (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &642287652830482507
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2814510134427997610}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -10, z: 0}
+  m_LocalScale: {x: 3.5, y: 3, z: 3.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8368877462968469787}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &4680905504009489264
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2814510134427997610}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  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: 5a16164fb0d247546b40d8c8ff8f3065, 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!33 &2877345063359395945
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2814510134427997610}
+  m_Mesh: {fileID: 4300000, guid: 1ded84720cc566a43b26b59b94db5f19, type: 2}
 --- !u!1001 &1744782095462081170
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -67,6 +154,26 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1602202008091483024, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 3f88a657b1010fe4190c6ecc0bf7c0a5, type: 2}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.b
+      value: 0.716981
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.g
+      value: 0.60791194
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337934842038808926, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: fogColor.r
+      value: 0.28070474
+      objectReference: {fileID: 0}
     - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.x
       value: 0.17513
@@ -81,19 +188,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.4596
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.7298
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalScale.z
-      value: 1.4596
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -50.33
+      value: -41
       objectReference: {fileID: 0}
     - target: {fileID: 4154994230707482304, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_Layer
@@ -103,10 +210,34 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4425146815379131757, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_Name
       value: cj02 (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 665.36066
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 56.032154
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 665.36066
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.000014835
+      objectReference: {fileID: 0}
+    - target: {fileID: 6990107168611760729, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 56
+      objectReference: {fileID: 0}
     - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -148,8 +279,13 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_RemovedGameObjects:
+    - {fileID: 6014684991204939609, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+    - {fileID: 4425146815379131757, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 642287652830482507}
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
 --- !u!1 &4787834087060179975 stripped

+ 38 - 87
Assets/Res/CombatScenes/LevelBattle02.prefab

@@ -62,88 +62,6 @@ MonoBehaviour:
   - {fileID: 3683907582521372588, guid: c19d229d8a45ed0458c1fea6112d29b7, type: 3}
   radius: 45
   dec: 
---- !u!1001 &3986193909677313104
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 5852812303139096713}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.99754554
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -7.6
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: -0.0009873678
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.0009873678
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0.7071061
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0.7071061
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: -180.16
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -7511558181221131132, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: c9fb8078a489c764e9c5286bb9821001, type: 2}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_Name
-      value: yuanjing_huan (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
---- !u!4 &3520538653813713851 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f61d564ea9bfa194f9adebd3e1caf520, type: 3}
-  m_PrefabInstance: {fileID: 3986193909677313104}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7548215640007385694
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -152,6 +70,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 8260501188212286327}
     m_Modifications:
+    - target: {fileID: 879977783264322425, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1398171176346647818, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalScale.x
       value: 1000
@@ -164,6 +86,26 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 624.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 53.80233
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 624.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.000049207
+      objectReference: {fileID: 0}
+    - target: {fileID: 2466693982673891355, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 65
+      objectReference: {fileID: 0}
     - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -232,6 +174,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6121734615867636914, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6899256924629427720, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -240,16 +186,21 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7053224253262756889, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 917728294fc27df44acf209e4899e361, type: 2}
     - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
       propertyPath: m_Name
       value: cj01 (1)
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 3520538653813713851}
+    m_RemovedGameObjects:
+    - {fileID: 7153538565988912838, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - {fileID: 747153756437657183, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - {fileID: 6121734615867636914, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    - {fileID: 4917829007436643089, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+    m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
 --- !u!1 &1381729068282112590 stripped

+ 10 - 98
Assets/Res/CombatScenes/LevelBattle03.prefab

@@ -134,9 +134,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   skyObejct: {fileID: 6547143922713598540}
-  fogColor: {r: 0.21600002, g: 0.29280004, b: 0.6, a: 1}
-  fogStartDistance: 30
-  fogEndDistance: 80
+  fogColor: {r: 0.21568628, g: 0.29411766, b: 0.6, a: 1}
+  fogStartDistance: 80
+  fogEndDistance: 150
   allObject:
   - {fileID: 5829875553534260591, guid: 96fc37aadb9bc8840ad5fa98172cd16f, type: 3}
   radius: 45
@@ -174,93 +174,6 @@ Transform:
   - {fileID: 3271622544173978875}
   m_Father: {fileID: 7319546472223068688}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &4509268593997191767
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3585384551010318200}
-  - component: {fileID: 4077837472308421636}
-  - component: {fileID: 4513731945305176033}
-  m_Layer: 7
-  m_HasEditorInfo: 1
-  m_Name: yun_qiu
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3585384551010318200
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4509268593997191767}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 7319546472223068688}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &4077837472308421636
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4509268593997191767}
-  m_Mesh: {fileID: -6740526933416455741, guid: f8c594ef52ebfc44e98bdc02acc2a16c, type: 3}
---- !u!23 &4513731945305176033
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4509268593997191767}
-  m_Enabled: 1
-  m_CastShadows: 1
-  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: afd2d3f979649ab47b32169c16a1b2ed, 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!1 &5999680719607194215
 GameObject:
   m_ObjectHideFlags: 0
@@ -279,7 +192,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &8284061920447749403
 Transform:
   m_ObjectHideFlags: 0
@@ -318,7 +231,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 4ebb2e35dc241aa4c9310f57ae11706a, type: 2}
+  - {fileID: 2100000, guid: 1aed9d88725f87842a544e4dc8ccd47f, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -376,8 +289,8 @@ Transform:
   m_GameObject: {fileID: 6046298269311816277}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -12.5, z: 0}
-  m_LocalScale: {x: 500, y: 96.43, z: 500}
+  m_LocalPosition: {x: 0.000025568, y: 40, z: 0}
+  m_LocalScale: {x: 633.19, y: 61.05851, z: 633.19}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7169143794090459126}
@@ -413,7 +326,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 63837601a8b53204d813f3789422f179, type: 2}
+  - {fileID: 2100000, guid: 1f9b906e78879654ab40f5dadfd5341a, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -469,7 +382,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6405123835914438810}
-  - {fileID: 3585384551010318200}
   - {fileID: 6635004569205135084}
   - {fileID: 7169143794090459126}
   - {fileID: 8284061920447749403}
@@ -579,7 +491,7 @@ Transform:
   m_GameObject: {fileID: 9011782773388340285}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 5, z: 0}
+  m_LocalPosition: {x: 0, y: 6, z: 0}
   m_LocalScale: {x: 1000, y: 30, z: 500}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -662,7 +574,7 @@ MonoBehaviour:
   sortingLayer: Default
   sortingOrder: 0
   renderingLayerMask: 4294967295
-  fogColor: {r: 0.9056602, g: 0.551289, b: 0.3332145, a: 0.83137256}
+  fogColor: {r: 0.9056602, g: 0.551289, b: 0.3332145, a: 1}
   blendType: 0
   fogMeshType: 0
   customMesh: {fileID: 0}

+ 25 - 25
Assets/Res/Config/DropGroupConfig.json

@@ -135,175 +135,175 @@
     },
     {
       "ID": 20,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         19
       ]
     },
     {
       "ID": 21,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         20
       ]
     },
     {
       "ID": 22,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         21
       ]
     },
     {
       "ID": 23,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         22
       ]
     },
     {
       "ID": 24,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         23
       ]
     },
     {
       "ID": 25,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         24
       ]
     },
     {
       "ID": 26,
-      "dropRate": 618,
+      "dropRate": 1067,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 27,
-      "dropRate": 133,
+      "dropRate": 266,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 28,
-      "dropRate": 67,
+      "dropRate": 134,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 29,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         19
       ]
     },
     {
       "ID": 30,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         20
       ]
     },
     {
       "ID": 31,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         21
       ]
     },
     {
       "ID": 32,
-      "dropRate": 1110,
+      "dropRate": 667,
       "dropItemID": [
         22
       ]
     },
     {
       "ID": 33,
-      "dropRate": 370,
+      "dropRate": 400,
       "dropItemID": [
         23
       ]
     },
     {
       "ID": 34,
-      "dropRate": 111,
+      "dropRate": 200,
       "dropItemID": [
         24
       ]
     },
     {
       "ID": 35,
-      "dropRate": 30,
+      "dropRate": 415,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 36,
-      "dropRate": 245,
+      "dropRate": 210,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 37,
-      "dropRate": 168,
+      "dropRate": 294,
       "dropItemID": [
         16
       ]
     },
     {
       "ID": 38,
-      "dropRate": 123,
+      "dropRate": 106,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 39,
-      "dropRate": 42,
+      "dropRate": 74,
       "dropItemID": [
         18
       ]
     },
     {
       "ID": 40,
-      "dropRate": 3212,
+      "dropRate": 2948,
       "dropItemID": [
         14
       ]
     },
     {
       "ID": 41,
-      "dropRate": 245,
+      "dropRate": 210,
       "dropItemID": [
         15
       ]
     },
     {
       "ID": 42,
-      "dropRate": 168,
+      "dropRate": 294,
       "dropItemID": [
         16
       ]
     },
     {
       "ID": 43,
-      "dropRate": 123,
+      "dropRate": 106,
       "dropItemID": [
         17
       ]
     },
     {
       "ID": 44,
-      "dropRate": 42,
+      "dropRate": 74,
       "dropItemID": [
         18
       ]

+ 12 - 12
Assets/Res/Config/DropItemConfig.json

@@ -266,8 +266,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 200,
-      "dropMaxV": 200,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
@@ -276,8 +276,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 400,
-      "dropMaxV": 400,
+      "dropMinV": 600,
+      "dropMaxV": 600,
       "dropCountGoupID": -1
     },
     {
@@ -286,8 +286,8 @@
       "itemID": [
         1005
       ],
-      "dropMinV": 800,
-      "dropMaxV": 800,
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     },
     {
@@ -296,8 +296,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 200,
-      "dropMaxV": 200,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
@@ -306,8 +306,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 400,
-      "dropMaxV": 400,
+      "dropMinV": 600,
+      "dropMaxV": 600,
       "dropCountGoupID": -1
     },
     {
@@ -316,8 +316,8 @@
       "itemID": [
         1006
       ],
-      "dropMinV": 800,
-      "dropMaxV": 800,
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     },
     {

+ 1 - 1
Assets/Res/Config/EventConditionConfig.json

@@ -117,7 +117,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1004
+        1005
       ],
       "finishCount": 3,
       "RelatedEvents": [

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 147 - 161
Assets/Res/Config/EventConfig.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 125 - 127
Assets/Res/Config/EventLinkConfig.json


+ 1 - 1
Assets/Res/Config/EventNPC.json

@@ -32,7 +32,7 @@
       "ID": 5,
       "name": 1956,
       "isNpc": true,
-      "icon": "bg_lh_fengyao",
+      "icon": "bg_lh_wanxi",
       "DaoyouID": 4
     },
     {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 115 - 115
Assets/Res/Config/FabaoPowerupConfig.json


+ 28 - 28
Assets/Res/Config/GroupConfig.json

@@ -334,7 +334,7 @@
     {
       "ID": 3009,
       "GroupMonsterLevel": [
-        66
+        144
       ],
       "GroupMonster": [
         5003
@@ -343,7 +343,7 @@
     {
       "ID": 3010,
       "GroupMonsterLevel": [
-        76
+        145
       ],
       "GroupMonster": [
         5002
@@ -944,16 +944,16 @@
         1003
       ],
       "hpQiangDu": [
-        48,
-        48
+        64,
+        32
       ],
       "attQiangDu": [
-        64,
-        64
+        56,
+        29
       ],
       "duipingQiangDu": [
-        48,
-        48
+        54,
+        26
       ]
     },
     {
@@ -963,16 +963,16 @@
         1003
       ],
       "hpQiangDu": [
-        54,
-        54
+        72,
+        36
       ],
       "attQiangDu": [
-        72,
-        72
+        63,
+        32
       ],
       "duipingQiangDu": [
         54,
-        54
+        30
       ]
     },
     {
@@ -982,16 +982,16 @@
         1003
       ],
       "hpQiangDu": [
-        60,
-        60
+        80,
+        40
       ],
       "attQiangDu": [
-        80,
-        80
+        70,
+        36
       ],
       "duipingQiangDu": [
         60,
-        60
+        33
       ]
     },
     {
@@ -1001,16 +1001,16 @@
         1003
       ],
       "hpQiangDu": [
-        63,
-        63
+        84,
+        42
       ],
       "attQiangDu": [
-        84,
-        84
+        74,
+        38
       ],
       "duipingQiangDu": [
         63,
-        63
+        35
       ]
     },
     {
@@ -1020,16 +1020,16 @@
         1003
       ],
       "hpQiangDu": [
-        66,
-        66
+        88,
+        44
       ],
       "attQiangDu": [
-        88,
-        88
+        77,
+        40
       ],
       "duipingQiangDu": [
         66,
-        66
+        36
       ]
     },
     {

+ 2 - 2
Assets/Res/Config/HeroModelConfig.json

@@ -1340,8 +1340,8 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 72,
-      "hp": 102,
+      "attack": 77,
+      "hp": 115,
       "def": 100,
       "shield": 85,
       "speed_atk": 0.0,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 114 - 114
Assets/Res/Config/HeroPowerUpConfig.json


+ 28 - 28
Assets/Res/Config/ItemConfig.json

@@ -375,7 +375,7 @@
       "ID": 1201,
       "itemName": 250,
       "itemDesc": 259,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1201",
       "itemTag": 3,
       "quality": 2,
       "stack": 0,
@@ -409,7 +409,7 @@
       "ID": 1202,
       "itemName": 251,
       "itemDesc": 260,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1202",
       "itemTag": 3,
       "quality": 2,
       "stack": 0,
@@ -443,7 +443,7 @@
       "ID": 1203,
       "itemName": 252,
       "itemDesc": 261,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1203",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -477,7 +477,7 @@
       "ID": 1204,
       "itemName": 253,
       "itemDesc": 262,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1204",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -511,7 +511,7 @@
       "ID": 1205,
       "itemName": 254,
       "itemDesc": 263,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1205",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -545,7 +545,7 @@
       "ID": 1206,
       "itemName": 255,
       "itemDesc": 264,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1206",
       "itemTag": 3,
       "quality": 3,
       "stack": 0,
@@ -579,7 +579,7 @@
       "ID": 1207,
       "itemName": 256,
       "itemDesc": 265,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1207",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -613,7 +613,7 @@
       "ID": 1208,
       "itemName": 257,
       "itemDesc": 266,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1208",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -647,7 +647,7 @@
       "ID": 1209,
       "itemName": 258,
       "itemDesc": 267,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1209",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -681,7 +681,7 @@
       "ID": 1210,
       "itemName": 10452,
       "itemDesc": 10486,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1210",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -715,7 +715,7 @@
       "ID": 1211,
       "itemName": 10453,
       "itemDesc": 10487,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1211",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -749,7 +749,7 @@
       "ID": 1212,
       "itemName": 10454,
       "itemDesc": 10488,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1212",
       "itemTag": 3,
       "quality": 4,
       "stack": 0,
@@ -783,7 +783,7 @@
       "ID": 1213,
       "itemName": 10455,
       "itemDesc": 10489,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1213",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -817,7 +817,7 @@
       "ID": 1214,
       "itemName": 10456,
       "itemDesc": 10490,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1214",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -851,7 +851,7 @@
       "ID": 1215,
       "itemName": 10457,
       "itemDesc": 10491,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1215",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -885,7 +885,7 @@
       "ID": 1216,
       "itemName": 10458,
       "itemDesc": 10492,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1216",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -919,7 +919,7 @@
       "ID": 1217,
       "itemName": 10459,
       "itemDesc": 10493,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1217",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -953,7 +953,7 @@
       "ID": 1218,
       "itemName": 10460,
       "itemDesc": 10494,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1218",
       "itemTag": 3,
       "quality": 5,
       "stack": 0,
@@ -987,7 +987,7 @@
       "ID": 1219,
       "itemName": 10461,
       "itemDesc": 10495,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1219",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1021,7 +1021,7 @@
       "ID": 1220,
       "itemName": 10462,
       "itemDesc": 10496,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1220",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1055,7 +1055,7 @@
       "ID": 1221,
       "itemName": 10463,
       "itemDesc": 10497,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1221",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1089,7 +1089,7 @@
       "ID": 1222,
       "itemName": 10464,
       "itemDesc": 10498,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1222",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1123,7 +1123,7 @@
       "ID": 1223,
       "itemName": 10465,
       "itemDesc": 10499,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1223",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1157,7 +1157,7 @@
       "ID": 1224,
       "itemName": 10466,
       "itemDesc": 10500,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1224",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1191,7 +1191,7 @@
       "ID": 1225,
       "itemName": 10467,
       "itemDesc": 10501,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1225",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1225,7 +1225,7 @@
       "ID": 1226,
       "itemName": 10468,
       "itemDesc": 10502,
-      "icon": "icon_dujiedan",
+      "icon": "icon_item_1226",
       "itemTag": 3,
       "quality": 6,
       "stack": 0,
@@ -1701,7 +1701,7 @@
       "ID": 1314,
       "itemName": 10473,
       "itemDesc": 10507,
-      "icon": "icon_item_1314",
+      "icon": "icon_item_1218",
       "itemTag": 4,
       "quality": 4,
       "stack": 0,
@@ -7469,7 +7469,7 @@
       "stack": 0,
       "isSell": false,
       "rewardsNum": 0,
-      "isVisible": 1,
+      "isVisible": 0,
       "isUse": false,
       "useLimit": 0,
       "costItemNum": 0,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 753 - 753
Assets/Res/Config/LanguageChineseConfig.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 156 - 156
Assets/Res/Config/LanguageChineseConfig_skill.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 288 - 288
Assets/Res/Config/MonsterPowerUpConfig.json


+ 22 - 22
Assets/Res/Config/PlayerGuideConfig.json

@@ -887,7 +887,7 @@
       "SpeakerImage": 3,
       "desc": 10416,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -923,7 +923,7 @@
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -959,7 +959,7 @@
       "SpeakerImage": 3,
       "desc": 10417,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -979,8 +979,8 @@
       "groupID": 7,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        -517
+        -256,
+        200
       ],
       "NpcPos": [
         422,
@@ -995,7 +995,7 @@
       "SpeakerImage": 3,
       "desc": 10418,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1015,8 +1015,8 @@
       "groupID": 7,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        -517
+        -241,
+        -430
       ],
       "NpcPos": [
         422,
@@ -1031,7 +1031,7 @@
       "SpeakerImage": 3,
       "desc": 10419,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1065,9 +1065,9 @@
       "SpeakerName": 0,
       "SpeakerStyle": 1,
       "SpeakerImage": 3,
-      "desc": 10420,
+      "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1088,7 +1088,7 @@
       "FingerType": 1,
       "dialogPos": [
         -182,
-        -517
+        200
       ],
       "NpcPos": [
         422,
@@ -1103,7 +1103,7 @@
       "SpeakerImage": 3,
       "desc": 10421,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1139,7 +1139,7 @@
       "SpeakerImage": 3,
       "desc": 10422,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1175,7 +1175,7 @@
       "SpeakerImage": 3,
       "desc": 10423,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.8,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1217,7 +1217,7 @@
       "AwardItemNum": [
         300
       ],
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1253,7 +1253,7 @@
       "SpeakerImage": 3,
       "desc": -1,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1289,7 +1289,7 @@
       "SpeakerImage": 3,
       "desc": 10425,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1325,7 +1325,7 @@
       "SpeakerImage": 3,
       "desc": 10448,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [
@@ -1345,8 +1345,8 @@
       "groupID": 9,
       "FingerType": 1,
       "dialogPos": [
-        -182,
-        -517
+        -83,
+        83
       ],
       "NpcPos": [
         422,
@@ -1361,7 +1361,7 @@
       "SpeakerImage": 3,
       "desc": 10449,
       "Highlighting": 1,
-      "blackAlpha": 0.0,
+      "blackAlpha": 0.7,
       "Handle": 1,
       "IsSkip": 0,
       "TextSize": [

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 182 - 182
Assets/Res/Config/ResourceLevelConfig.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 161 - 161
Assets/Res/Config/SentimentEffectConfig.json


+ 4 - 1
Assets/Res/Config/SkillConfig.json

@@ -9745,7 +9745,10 @@
         5.0,
         5.0
       ],
-      "PromoteLan": 1234023
+      "PromoteLan": 1234023,
+      "PromoteLanPara": [
+        5.0
+      ]
     },
     {
       "ID": 34024,

+ 7 - 7
Assets/Res/Config/SkillConstant.json

@@ -3,21 +3,21 @@
     {
       "ID": 3,
       "SkillPromoteNeedPieceNum": [
-        3,
-        6,
         9,
-        15,
-        24
+        18,
+        30,
+        45,
+        60
       ]
     },
     {
       "ID": 4,
       "SkillPromoteNeedPieceNum": [
-        10,
-        10,
         20,
         20,
-        30
+        30,
+        40,
+        50
       ]
     },
     {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 112 - 112
Assets/Res/Config/SkillPowerupConfig.json


+ 100 - 100
Assets/Res/Config/TowerInfoConfig.json

@@ -16,7 +16,7 @@
       ],
       "rewardCount": [
         1,
-        4200
+        7000
       ],
       "unlockValue": 0
     },
@@ -36,7 +36,7 @@
       ],
       "rewardCount": [
         1,
-        4200
+        7000
       ],
       "unlockValue": 0
     },
@@ -56,7 +56,7 @@
       ],
       "rewardCount": [
         1,
-        4200
+        7000
       ],
       "unlockValue": 0
     },
@@ -76,7 +76,7 @@
       ],
       "rewardCount": [
         1,
-        4500
+        7500
       ],
       "unlockValue": 0
     },
@@ -96,7 +96,7 @@
       ],
       "rewardCount": [
         1,
-        4500
+        7500
       ],
       "unlockValue": 0
     },
@@ -116,7 +116,7 @@
       ],
       "rewardCount": [
         1,
-        4500
+        7500
       ],
       "unlockValue": 0
     },
@@ -136,7 +136,7 @@
       ],
       "rewardCount": [
         1,
-        4800
+        8000
       ],
       "unlockValue": 0
     },
@@ -156,7 +156,7 @@
       ],
       "rewardCount": [
         1,
-        4800
+        8000
       ],
       "unlockValue": 0
     },
@@ -176,7 +176,7 @@
       ],
       "rewardCount": [
         1,
-        5100
+        8500
       ],
       "unlockValue": 0
     },
@@ -196,7 +196,7 @@
       ],
       "rewardCount": [
         1,
-        5100
+        8500
       ],
       "unlockValue": 0
     },
@@ -216,7 +216,7 @@
       ],
       "rewardCount": [
         1,
-        5100
+        8500
       ],
       "unlockValue": 0
     },
@@ -236,7 +236,7 @@
       ],
       "rewardCount": [
         1,
-        5400
+        9000
       ],
       "unlockValue": 0
     },
@@ -256,7 +256,7 @@
       ],
       "rewardCount": [
         1,
-        5400
+        9000
       ],
       "unlockValue": 0
     },
@@ -276,7 +276,7 @@
       ],
       "rewardCount": [
         1,
-        5700
+        9500
       ],
       "unlockValue": 0
     },
@@ -296,7 +296,7 @@
       ],
       "rewardCount": [
         1,
-        5700
+        9500
       ],
       "unlockValue": 0
     },
@@ -316,7 +316,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        10000
       ],
       "unlockValue": 0
     },
@@ -336,7 +336,7 @@
       ],
       "rewardCount": [
         1,
-        6000
+        10000
       ],
       "unlockValue": 0
     },
@@ -356,7 +356,7 @@
       ],
       "rewardCount": [
         1,
-        6300
+        10500
       ],
       "unlockValue": 0
     },
@@ -376,7 +376,7 @@
       ],
       "rewardCount": [
         1,
-        6300
+        10500
       ],
       "unlockValue": 0
     },
@@ -396,7 +396,7 @@
       ],
       "rewardCount": [
         1,
-        6600
+        11000
       ],
       "unlockValue": 0
     },
@@ -416,7 +416,7 @@
       ],
       "rewardCount": [
         1,
-        6600
+        11000
       ],
       "unlockValue": 0
     },
@@ -436,7 +436,7 @@
       ],
       "rewardCount": [
         1,
-        6900
+        11500
       ],
       "unlockValue": 0
     },
@@ -456,7 +456,7 @@
       ],
       "rewardCount": [
         1,
-        6900
+        11500
       ],
       "unlockValue": 0
     },
@@ -476,7 +476,7 @@
       ],
       "rewardCount": [
         1,
-        7200
+        12000
       ],
       "unlockValue": 0
     },
@@ -496,7 +496,7 @@
       ],
       "rewardCount": [
         1,
-        7500
+        12500
       ],
       "unlockValue": 0
     },
@@ -516,7 +516,7 @@
       ],
       "rewardCount": [
         1,
-        7500
+        12500
       ],
       "unlockValue": 0
     },
@@ -536,7 +536,7 @@
       ],
       "rewardCount": [
         1,
-        7800
+        13000
       ],
       "unlockValue": 0
     },
@@ -556,7 +556,7 @@
       ],
       "rewardCount": [
         1,
-        8100
+        13500
       ],
       "unlockValue": 0
     },
@@ -576,7 +576,7 @@
       ],
       "rewardCount": [
         1,
-        8100
+        13500
       ],
       "unlockValue": 0
     },
@@ -596,7 +596,7 @@
       ],
       "rewardCount": [
         1,
-        8400
+        14000
       ],
       "unlockValue": 0
     },
@@ -616,7 +616,7 @@
       ],
       "rewardCount": [
         1,
-        8700
+        14500
       ],
       "unlockValue": 0
     },
@@ -636,7 +636,7 @@
       ],
       "rewardCount": [
         1,
-        9000
+        15000
       ],
       "unlockValue": 0
     },
@@ -656,7 +656,7 @@
       ],
       "rewardCount": [
         1,
-        9000
+        15000
       ],
       "unlockValue": 0
     },
@@ -676,7 +676,7 @@
       ],
       "rewardCount": [
         1,
-        9300
+        15500
       ],
       "unlockValue": 0
     },
@@ -696,7 +696,7 @@
       ],
       "rewardCount": [
         1,
-        9600
+        16000
       ],
       "unlockValue": 0
     },
@@ -716,7 +716,7 @@
       ],
       "rewardCount": [
         1,
-        9900
+        16500
       ],
       "unlockValue": 0
     },
@@ -736,7 +736,7 @@
       ],
       "rewardCount": [
         1,
-        9900
+        16500
       ],
       "unlockValue": 0
     },
@@ -756,7 +756,7 @@
       ],
       "rewardCount": [
         1,
-        10200
+        17000
       ],
       "unlockValue": 0
     },
@@ -776,7 +776,7 @@
       ],
       "rewardCount": [
         1,
-        10500
+        17500
       ],
       "unlockValue": 0
     },
@@ -796,7 +796,7 @@
       ],
       "rewardCount": [
         1,
-        10800
+        18000
       ],
       "unlockValue": 0
     },
@@ -816,7 +816,7 @@
       ],
       "rewardCount": [
         1,
-        11100
+        18500
       ],
       "unlockValue": 0
     },
@@ -836,7 +836,7 @@
       ],
       "rewardCount": [
         1,
-        11400
+        19000
       ],
       "unlockValue": 0
     },
@@ -856,7 +856,7 @@
       ],
       "rewardCount": [
         1,
-        11700
+        19500
       ],
       "unlockValue": 0
     },
@@ -876,7 +876,7 @@
       ],
       "rewardCount": [
         1,
-        12000
+        20000
       ],
       "unlockValue": 0
     },
@@ -896,7 +896,7 @@
       ],
       "rewardCount": [
         1,
-        12300
+        20500
       ],
       "unlockValue": 0
     },
@@ -916,7 +916,7 @@
       ],
       "rewardCount": [
         1,
-        12300
+        20500
       ],
       "unlockValue": 0
     },
@@ -936,7 +936,7 @@
       ],
       "rewardCount": [
         1,
-        12900
+        21500
       ],
       "unlockValue": 0
     },
@@ -956,7 +956,7 @@
       ],
       "rewardCount": [
         1,
-        13200
+        22000
       ],
       "unlockValue": 0
     },
@@ -976,7 +976,7 @@
       ],
       "rewardCount": [
         1,
-        13500
+        22500
       ],
       "unlockValue": 0
     },
@@ -996,7 +996,7 @@
       ],
       "rewardCount": [
         1,
-        13800
+        23000
       ],
       "unlockValue": 0
     },
@@ -1016,7 +1016,7 @@
       ],
       "rewardCount": [
         1,
-        14100
+        23500
       ],
       "unlockValue": 0
     },
@@ -1036,7 +1036,7 @@
       ],
       "rewardCount": [
         1,
-        14700
+        24500
       ],
       "unlockValue": 0
     },
@@ -1056,7 +1056,7 @@
       ],
       "rewardCount": [
         1,
-        15000
+        25000
       ],
       "unlockValue": 0
     },
@@ -1076,7 +1076,7 @@
       ],
       "rewardCount": [
         1,
-        15300
+        25500
       ],
       "unlockValue": 0
     },
@@ -1096,7 +1096,7 @@
       ],
       "rewardCount": [
         1,
-        15600
+        26000
       ],
       "unlockValue": 0
     },
@@ -1116,7 +1116,7 @@
       ],
       "rewardCount": [
         1,
-        16200
+        27000
       ],
       "unlockValue": 0
     },
@@ -1136,7 +1136,7 @@
       ],
       "rewardCount": [
         1,
-        16500
+        27500
       ],
       "unlockValue": 0
     },
@@ -1156,7 +1156,7 @@
       ],
       "rewardCount": [
         1,
-        16800
+        28000
       ],
       "unlockValue": 0
     },
@@ -1176,7 +1176,7 @@
       ],
       "rewardCount": [
         1,
-        17400
+        29000
       ],
       "unlockValue": 0
     },
@@ -1196,7 +1196,7 @@
       ],
       "rewardCount": [
         1,
-        18000
+        30000
       ],
       "unlockValue": 0
     },
@@ -1216,7 +1216,7 @@
       ],
       "rewardCount": [
         1,
-        18300
+        30500
       ],
       "unlockValue": 0
     },
@@ -1236,7 +1236,7 @@
       ],
       "rewardCount": [
         1,
-        18600
+        31000
       ],
       "unlockValue": 0
     },
@@ -1256,7 +1256,7 @@
       ],
       "rewardCount": [
         1,
-        19200
+        32000
       ],
       "unlockValue": 0
     },
@@ -1276,7 +1276,7 @@
       ],
       "rewardCount": [
         1,
-        19800
+        33000
       ],
       "unlockValue": 0
     },
@@ -1296,7 +1296,7 @@
       ],
       "rewardCount": [
         1,
-        20100
+        33500
       ],
       "unlockValue": 0
     },
@@ -1316,7 +1316,7 @@
       ],
       "rewardCount": [
         1,
-        20400
+        34000
       ],
       "unlockValue": 0
     },
@@ -1336,7 +1336,7 @@
       ],
       "rewardCount": [
         1,
-        21300
+        35500
       ],
       "unlockValue": 0
     },
@@ -1356,7 +1356,7 @@
       ],
       "rewardCount": [
         1,
-        21900
+        36500
       ],
       "unlockValue": 0
     },
@@ -1376,7 +1376,7 @@
       ],
       "rewardCount": [
         1,
-        22200
+        37000
       ],
       "unlockValue": 0
     },
@@ -1396,7 +1396,7 @@
       ],
       "rewardCount": [
         1,
-        22800
+        38000
       ],
       "unlockValue": 0
     },
@@ -1416,7 +1416,7 @@
       ],
       "rewardCount": [
         1,
-        23400
+        39000
       ],
       "unlockValue": 0
     },
@@ -1436,7 +1436,7 @@
       ],
       "rewardCount": [
         1,
-        24000
+        40000
       ],
       "unlockValue": 0
     },
@@ -1456,7 +1456,7 @@
       ],
       "rewardCount": [
         1,
-        24600
+        41000
       ],
       "unlockValue": 0
     },
@@ -1476,7 +1476,7 @@
       ],
       "rewardCount": [
         1,
-        25200
+        42000
       ],
       "unlockValue": 0
     },
@@ -1496,7 +1496,7 @@
       ],
       "rewardCount": [
         1,
-        25800
+        43000
       ],
       "unlockValue": 0
     },
@@ -1516,7 +1516,7 @@
       ],
       "rewardCount": [
         1,
-        26700
+        44500
       ],
       "unlockValue": 0
     },
@@ -1536,7 +1536,7 @@
       ],
       "rewardCount": [
         1,
-        27300
+        45500
       ],
       "unlockValue": 0
     },
@@ -1556,7 +1556,7 @@
       ],
       "rewardCount": [
         1,
-        27600
+        46000
       ],
       "unlockValue": 0
     },
@@ -1576,7 +1576,7 @@
       ],
       "rewardCount": [
         1,
-        28500
+        47500
       ],
       "unlockValue": 0
     },
@@ -1596,7 +1596,7 @@
       ],
       "rewardCount": [
         1,
-        29400
+        49000
       ],
       "unlockValue": 0
     },
@@ -1616,7 +1616,7 @@
       ],
       "rewardCount": [
         1,
-        30000
+        50000
       ],
       "unlockValue": 0
     },
@@ -1636,7 +1636,7 @@
       ],
       "rewardCount": [
         1,
-        30600
+        51000
       ],
       "unlockValue": 0
     },
@@ -1656,7 +1656,7 @@
       ],
       "rewardCount": [
         1,
-        31500
+        52500
       ],
       "unlockValue": 0
     },
@@ -1676,7 +1676,7 @@
       ],
       "rewardCount": [
         1,
-        32700
+        54500
       ],
       "unlockValue": 0
     },
@@ -1696,7 +1696,7 @@
       ],
       "rewardCount": [
         1,
-        33300
+        55500
       ],
       "unlockValue": 0
     },
@@ -1716,7 +1716,7 @@
       ],
       "rewardCount": [
         1,
-        33900
+        56500
       ],
       "unlockValue": 0
     },
@@ -1736,7 +1736,7 @@
       ],
       "rewardCount": [
         1,
-        34800
+        58000
       ],
       "unlockValue": 0
     },
@@ -1756,7 +1756,7 @@
       ],
       "rewardCount": [
         1,
-        36000
+        60000
       ],
       "unlockValue": 0
     },
@@ -1776,7 +1776,7 @@
       ],
       "rewardCount": [
         1,
-        36600
+        61000
       ],
       "unlockValue": 0
     },
@@ -1796,7 +1796,7 @@
       ],
       "rewardCount": [
         1,
-        37500
+        62500
       ],
       "unlockValue": 0
     },
@@ -1816,7 +1816,7 @@
       ],
       "rewardCount": [
         1,
-        38700
+        64500
       ],
       "unlockValue": 0
     },
@@ -1836,7 +1836,7 @@
       ],
       "rewardCount": [
         1,
-        40200
+        67000
       ],
       "unlockValue": 0
     },
@@ -1856,7 +1856,7 @@
       ],
       "rewardCount": [
         1,
-        42300
+        70500
       ],
       "unlockValue": 0
     },
@@ -1876,7 +1876,7 @@
       ],
       "rewardCount": [
         1,
-        44400
+        74000
       ],
       "unlockValue": 0
     },
@@ -1896,7 +1896,7 @@
       ],
       "rewardCount": [
         1,
-        46800
+        78000
       ],
       "unlockValue": 0
     },
@@ -1916,7 +1916,7 @@
       ],
       "rewardCount": [
         1,
-        49200
+        82000
       ],
       "unlockValue": 0
     },
@@ -1936,7 +1936,7 @@
       ],
       "rewardCount": [
         1,
-        51600
+        86000
       ],
       "unlockValue": 0
     },
@@ -1956,7 +1956,7 @@
       ],
       "rewardCount": [
         1,
-        54300
+        90500
       ],
       "unlockValue": 0
     },
@@ -1976,7 +1976,7 @@
       ],
       "rewardCount": [
         1,
-        57000
+        95000
       ],
       "unlockValue": 0
     },
@@ -1996,7 +1996,7 @@
       ],
       "rewardCount": [
         1,
-        60000
+        100000
       ],
       "unlockValue": 0
     }

+ 12 - 12
Assets/Res/UI/BackgroundPanel/open.anim

@@ -24,14 +24,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 17.459253
+        outSlope: 17.459253
+        tangentMode: 0
         weightedMode: 0
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.18192309
       - serializedVersion: 3
-        time: 0.3
+        time: 0.1
         value: 1
         inSlope: 0
         outSlope: 0
@@ -48,7 +48,7 @@ AnimationClip:
     script: {fileID: 0}
     flags: 0
   m_PPtrCurves: []
-  m_SampleRate: 30
+  m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
     m_Center: {x: 0, y: 0, z: 0}
@@ -70,7 +70,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.3
+    m_StopTime: 0.1
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -93,14 +93,14 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        inSlope: 17.459253
+        outSlope: 17.459253
+        tangentMode: 0
         weightedMode: 0
         inWeight: 0.33333334
-        outWeight: 0.33333334
+        outWeight: 0.18192309
       - serializedVersion: 3
-        time: 0.3
+        time: 0.1
         value: 1
         inSlope: 0
         outSlope: 0

+ 61 - 61
Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -352,7 +352,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533
 CanvasGroup:
@@ -3398,7 +3398,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3498,15 +3498,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3518,11 +3518,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3549,7 +3549,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3649,15 +3649,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3669,11 +3669,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3700,7 +3700,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3800,15 +3800,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3820,11 +3820,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3851,7 +3851,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3951,15 +3951,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3971,11 +3971,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4002,7 +4002,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4102,15 +4102,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4122,11 +4122,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4153,7 +4153,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4253,15 +4253,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4273,11 +4273,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4304,7 +4304,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4404,15 +4404,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4424,11 +4424,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4455,7 +4455,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4555,15 +4555,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4575,11 +4575,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4606,7 +4606,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4706,15 +4706,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4726,11 +4726,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4757,7 +4757,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4857,15 +4857,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4877,11 +4877,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

+ 26 - 26
Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -19,7 +19,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8133080571240593798
 RectTransform:
   m_ObjectHideFlags: 0
@@ -445,10 +445,10 @@ RectTransform:
   - {fileID: 5428019602683763515}
   m_Father: {fileID: 7858018693182147813}
   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: -288.98627}
-  m_SizeDelta: {x: 646.872, y: 616.7927}
+  m_AnchorMin: {x: 0.5, y: 0.13338424}
+  m_AnchorMax: {x: 0.5, y: 0.51084733}
+  m_AnchoredPosition: {x: 0, y: 1.0136719}
+  m_SizeDelta: {x: 646.872, y: 0.7927246}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2564010822953909151
 CanvasRenderer:
@@ -538,8 +538,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.5809, y: -57.711}
-  m_SizeDelta: {x: 625.863, y: 424.8}
+  m_AnchoredPosition: {x: -0.5809021, y: -57.711}
+  m_SizeDelta: {x: 625.863, y: 320.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6748753096610578173
 CanvasRenderer:
@@ -643,10 +643,10 @@ RectTransform:
   - {fileID: 7237139809221645204}
   m_Father: {fileID: 5366739683216167502}
   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: 11.418977, y: 306.4947}
-  m_SizeDelta: {x: 228.0359, y: 55.1832}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 11.418977, y: -0.50531006}
+  m_SizeDelta: {x: 228.0359, y: 55.183197}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5341967818580382441
 CanvasRenderer:
@@ -828,10 +828,10 @@ RectTransform:
   - {fileID: 7883065359111312998}
   m_Father: {fileID: 5366739683216167502}
   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: 5.1745, y: -6.6163}
-  m_SizeDelta: {x: 633.25, y: 565.8463}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 5.1744995, y: -6.6163025}
+  m_SizeDelta: {x: -12.75, y: -48.153687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1299575708875599391
 CanvasRenderer:
@@ -934,10 +934,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5366739683216167502}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 643.5944, y: 613.34}
+  m_SizeDelta: {x: -2.4055786, y: -0.65997314}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5592096566782003340
 CanvasRenderer:
@@ -1389,10 +1389,10 @@ RectTransform:
   - {fileID: 7331267903340754230}
   m_Father: {fileID: 7858018693182147813}
   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: 331.11133}
-  m_SizeDelta: {x: 644.9078, y: 566.3665}
+  m_AnchorMin: {x: 0.5, y: 0.5271527}
+  m_AnchorMax: {x: 0.5, y: 0.87500006}
+  m_AnchoredPosition: {x: 0, y: 2.1113281}
+  m_SizeDelta: {x: 644.9078, y: -1.6334839}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6858452839668547294
 CanvasRenderer:
@@ -2087,10 +2087,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3787544951613840147}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0913, y: 2.5078}
-  m_SizeDelta: {x: 624.514, y: 545.241}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.091308594, y: 2.5078125}
+  m_SizeDelta: {x: -19.486023, y: -18.758972}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8574758566871946628
 CanvasRenderer:

+ 12 - 12
Assets/Res/UI/CombatPanel.prefab

@@ -750,7 +750,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: -32, y: -25}
+  m_AnchoredPosition: {x: -34.999977, y: -25}
   m_SizeDelta: {x: 58, y: 61}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7340582039138565285
@@ -1577,7 +1577,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: -32, y: -25}
+  m_AnchoredPosition: {x: -34.999977, y: -25}
   m_SizeDelta: {x: 68, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4675657056430347178
@@ -1755,7 +1755,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: 85.8, y: -20.1}
+  m_AnchoredPosition: {x: 108.59999, y: -20.1}
   m_SizeDelta: {x: 227.39, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7094924967954254907
@@ -4458,7 +4458,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: 81.7, y: -20.4}
+  m_AnchoredPosition: {x: 104.499985, y: -20.4}
   m_SizeDelta: {x: 234.7, y: 24.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8200075529076420752
@@ -4636,7 +4636,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: -32, y: -25}
+  m_AnchoredPosition: {x: -35, y: -25}
   m_SizeDelta: {x: 95, y: 95}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8212043821379529070
@@ -6497,7 +6497,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: -32, y: -25}
+  m_AnchoredPosition: {x: -34.999977, y: -25}
   m_SizeDelta: {x: 75, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4122648181825630809
@@ -6800,7 +6800,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: -59, y: 31}
+  m_AnchoredPosition: {x: -52.100006, y: 36}
   m_SizeDelta: {x: 84, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4199138803469849610
@@ -6978,7 +6978,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: 149.21, y: 17.7}
+  m_AnchoredPosition: {x: 172.01, y: 17.7}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &6266451616475677771
@@ -7433,7 +7433,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: -59, y: 31}
+  m_AnchoredPosition: {x: -52.100014, y: 36}
   m_SizeDelta: {x: 68, y: 68}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4963023395715097639
@@ -7678,7 +7678,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: -62.4, y: 32.1}
+  m_AnchoredPosition: {x: -55.500008, y: 37.1}
   m_SizeDelta: {x: 50, y: 65}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2407304736381725406
@@ -8128,7 +8128,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: -14.9, y: 29}
+  m_AnchoredPosition: {x: 7.899988, y: 29}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1601245502264627568
@@ -9300,7 +9300,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: -50, y: 4.98}
+  m_AnchoredPosition: {x: -27.2, y: 4.98}
   m_SizeDelta: {x: 250, y: 15}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6934183408135190191

+ 4 - 4
Assets/Res/UI/DivineSence/BossInfoPanel.prefab

@@ -1253,8 +1253,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: -32.4, y: 3.6}
-  m_SizeDelta: {x: 349.5654, y: 90.0548}
+  m_AnchoredPosition: {x: 44.569878, y: 3.6}
+  m_SizeDelta: {x: 504.1384, y: 90.0548}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5752223019001905554
 CanvasRenderer:
@@ -2837,8 +2837,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: -5.9401, y: 0.00011063}
-  m_SizeDelta: {x: 405.25, y: 107.3}
+  m_AnchoredPosition: {x: 43.5041, y: 0.00011063}
+  m_SizeDelta: {x: 504.1384, y: 107.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7447028169586020602
 CanvasRenderer:

+ 123 - 6
Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -337,7 +337,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 2.6099854, y: -8.905579}
+  m_AnchoredPosition: {x: 2.6099854, y: -8.905518}
   m_SizeDelta: {x: 718.82, y: -416.07}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &233757076051763532
@@ -459,7 +459,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1500, y: 3248}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -554,6 +554,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: DivineSenceHuoQuWidgetGam
+    gameObject: {fileID: 1052098454278746621}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1245667844451503244
 GameObject:
@@ -1000,8 +1005,8 @@ MonoBehaviour:
   Page: {x: 1, y: 1}
   bottom: 0
   wdiget: {fileID: 0}
-  sizeData: {x: 683, y: 282}
-  isCustomizeHeight: 0
+  sizeData: {x: 683, y: 25}
+  isCustomizeHeight: 1
   posOff: {x: 13, y: 0}
   isDelay: 0
   delayTime: 0
@@ -1671,8 +1676,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.000030517578}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 5.94, y: 0}
+  m_SizeDelta: {x: -11.88, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
 CanvasRenderer:
@@ -2183,6 +2188,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3581464887972855309}
+  - {fileID: 1445572438664158512}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -3161,6 +3167,117 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1001 &4381551719312464617
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4419547383971070637}
+    m_Modifications:
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 253
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3627557051994647316, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_Name
+      value: DivineSenceHuoQuWidget
+      objectReference: {fileID: 0}
+    - target: {fileID: 3627557051994647316, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+--- !u!1 &1052098454278746621 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3627557051994647316, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+  m_PrefabInstance: {fileID: 4381551719312464617}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1445572438664158512 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2936859786160048089, guid: 9cc882177d745f54e8c5c99674136b23, type: 3}
+  m_PrefabInstance: {fileID: 4381551719312464617}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6181054649854434105
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 218 - 0
Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab

@@ -0,0 +1,218 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3627557051994647316
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2936859786160048089}
+  - component: {fileID: 3158301123575424926}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: DivineSenceHuoQuWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2936859786160048089
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627557051994647316}
+  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: 8633998077493613913}
+  - {fileID: 7295177279328845725}
+  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: -66, y: -136}
+  m_SizeDelta: {x: 684, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3158301123575424926
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627557051994647316}
+  m_CullTransparentMesh: 1
+--- !u!1 &6407854385143611286
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8633998077493613913}
+  - component: {fileID: 151687995553922551}
+  - component: {fileID: 4965095530726692492}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: DivineSenceHuoQuWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8633998077493613913
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6407854385143611286}
+  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: 2936859786160048089}
+  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: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &151687995553922551
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6407854385143611286}
+  m_CullTransparentMesh: 1
+--- !u!114 &4965095530726692492
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6407854385143611286}
+  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.35488594, g: 0.56374943, b: 0.6839621, 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_juxing
+  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: e09f56329289dea619e61cb78606497c
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8022387299475652960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7295177279328845725}
+  - component: {fileID: 3811028064332339952}
+  - component: {fileID: 5345756085271467585}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7295177279328845725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8022387299475652960}
+  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: 2936859786160048089}
+  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_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3811028064332339952
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8022387299475652960}
+  m_CullTransparentMesh: 1
+--- !u!114 &5345756085271467585
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8022387299475652960}
+  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: 36
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u83B7\u53D6\u66F4\u591A"

+ 2 - 2
Assets/StreamingAssets/assetBundle.zip.meta → Assets/Res/UI/DivineSence/DivineSenceHuoQuWidget.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
-DefaultImporter:
+guid: BilMvSKvUnwNOXa5pJer2i9eLGAC6jRM038Ebe4ewDkBkLujGb02Vxn5IK8k
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

+ 1 - 1
Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -222,7 +222,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 189.53296, y: -49.37755}
-  m_SizeDelta: {x: 0, y: 96.45}
+  m_SizeDelta: {x: 108, y: 96.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5304083428607473890
 CanvasRenderer:

+ 553 - 5
Assets/Res/UI/DivineSence/GongFaWidgetType2.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &498122000546911970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6916979475307095600}
+  - component: {fileID: 3098553881310741778}
+  - component: {fileID: 4314374589381719289}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6916979475307095600
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3098553881310741778
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  m_CullTransparentMesh: 1
+--- !u!114 &4314374589381719289
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498122000546911970}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1671693449042742178
 GameObject:
   m_ObjectHideFlags: 0
@@ -35,8 +124,8 @@ RectTransform:
   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.0009498596, y: -29.9}
-  m_SizeDelta: {x: 68.466, y: 30}
+  m_AnchoredPosition: {x: 0.0000026226, y: -29.9}
+  m_SizeDelta: {x: 80, y: 31.1973}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1237620596013164419
 CanvasRenderer:
@@ -59,7 +148,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,7 +157,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 24
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -80,6 +169,273 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
+--- !u!1 &1916139475447988823
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2500376018970374053}
+  - component: {fileID: 9106823823273572709}
+  - component: {fileID: 5779671277336139395}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2500376018970374053
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &9106823823273572709
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  m_CullTransparentMesh: 1
+--- !u!114 &5779671277336139395
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1916139475447988823}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2471961167470248917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 216267843454775406}
+  - component: {fileID: 7113338127107576254}
+  - component: {fileID: 2940579089653344557}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &216267843454775406
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7113338127107576254
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  m_CullTransparentMesh: 1
+--- !u!114 &2940579089653344557
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471961167470248917}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3858005826730162093
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2115646262538371135}
+  - component: {fileID: 7640830385333969459}
+  - component: {fileID: 6141892540767857241}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2115646262538371135
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7640830385333969459
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  m_CullTransparentMesh: 1
+--- !u!114 &6141892540767857241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3858005826730162093}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3946302300112563901
 GameObject:
   m_ObjectHideFlags: 0
@@ -203,6 +559,7 @@ RectTransform:
   - {fileID: 4458728715945139816}
   - {fileID: 5381176108441561872}
   - {fileID: 3608208511281012576}
+  - {fileID: 3154258649401657841}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -246,6 +603,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: StarRoot
+    gameObject: {fileID: 8983252782158562355}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 498122000546911970}
+    - gameObject: {fileID: 3858005826730162093}
+    - gameObject: {fileID: 2471961167470248917}
+    - gameObject: {fileID: 8604186990887004553}
+    - gameObject: {fileID: 1916139475447988823}
   isAssetBundle: 1
 --- !u!1 &7146904648124061661
 GameObject:
@@ -265,7 +632,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5381176108441561872
 RectTransform:
   m_ObjectHideFlags: 0
@@ -426,3 +793,184 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &8604186990887004553
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7245220674678169516}
+  - component: {fileID: 3417995764051712588}
+  - component: {fileID: 5012569221925056839}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7245220674678169516
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  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: 3154258649401657841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3417995764051712588
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  m_CullTransparentMesh: 1
+--- !u!114 &5012569221925056839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8604186990887004553}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  imageH: 36
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8983252782158562355
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3154258649401657841}
+  - component: {fileID: 4372224768594358457}
+  - component: {fileID: 615741272539858957}
+  - component: {fileID: 1812978112319568024}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3154258649401657841
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 6916979475307095600}
+  - {fileID: 2115646262538371135}
+  - {fileID: 216267843454775406}
+  - {fileID: 7245220674678169516}
+  - {fileID: 2500376018970374053}
+  m_Father: {fileID: 3138042374053727249}
+  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.7, y: -38.7}
+  m_SizeDelta: {x: 0, y: 30.610802}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &4372224768594358457
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_CullTransparentMesh: 1
+--- !u!114 &615741272539858957
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1812978112319568024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8983252782158562355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  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

+ 7 - 7
Assets/Res/UI/DivineSence/SkipToWidget.prefab

@@ -57,13 +57,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 552283852197464311}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6784314, g: 0.62352943, b: 0.53333336, a: 1}
+  m_Color: {r: 0.40094328, g: 0.36587864, b: 0.30827242, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -171,7 +171,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8705883, g: 0.83921576, b: 0.7686275, a: 1}
+  m_Color: {r: 0.957547, g: 0.92226005, b: 0.84462875, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -188,7 +188,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_miaobian3
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -260,7 +260,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.8632074, g: 0.79882884, b: 0.655549, a: 0.41960785}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -349,7 +349,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.49411768, g: 0.5137255, b: 0.48235297, a: 1}
+  m_Color: {r: 0.084905386, g: 0.045710497, b: 0.011614403, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -358,7 +358,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2

BIN
Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png


BIN
Assets/Res/UI/DivineSence/战斗界面-战前信息1.png


BIN
Assets/Res/UI/DivineSence/战斗界面-战前详情.png


+ 6 - 6
Assets/Res/UI/GuidePanel/GuidePanel.prefab

@@ -281,7 +281,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8980392, g: 0.8745098, b: 0.81960785, a: 1}
+  m_Color: {r: 0.8254715, g: 0.78102595, b: 0.6852971, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -298,7 +298,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_miaobian3
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -387,7 +387,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43921572, g: 0.42352945, b: 0.36862746, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -397,7 +397,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -407,7 +407,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4F60"
+  m_Text: "\u4F60\u8BF4\u4EC0\u4E48\u624B\u673A\u5C31\u662F\u4EC0\u4E48"
 --- !u!114 &6543867474228140514
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2834,7 +2834,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5518757894177767966
 RectTransform:
   m_ObjectHideFlags: 0

+ 72 - 0
Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HeroBreakthroughSuccessPanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 2770016308502250410}
+    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!1107 &2770016308502250410
+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: 6389488304365623869}
+    m_Position: {x: 60, y: 330, 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: 6389488304365623869}
+--- !u!1102 &6389488304365623869
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: open
+  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: 4ed9721fa51d34b41841f47cd38936c1, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

+ 8 - 0
Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CnoYt3uqBngPgitpaj4YlTYIme64hzTDCPTlPiuvG9Kua3BvFaTnZA2/5892
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 320 - 0
Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim

@@ -0,0 +1,320 @@
+%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: HeroBreakthroughSuccessPanelopen
+  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: 0.3, y: 0.3, z: 0.3}
+        inSlope: {x: 5.3653207, y: 5.0028434, z: 4.861043}
+        outSlope: {x: 5.3653207, y: 5.0028434, z: 4.861043}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.276774, y: 0.25832236, z: 0.35058036}
+      - serializedVersion: 3
+        time: 0.2
+        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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: Icon_Tu
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 1
+        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_Alpha
+    path: myImage
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 1
+        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_Color.a
+    path: Icon_Tu
+    classID: 114
+    script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+    flags: 0
+  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: 2606532322
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2583589396
+      attribute: 1574349066
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2606532322
+      attribute: 304273561
+      script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+      typeID: 114
+      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: 0.2
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    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: 0.3
+        inSlope: 5.3653207
+        outSlope: 5.3653207
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.276774
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        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: Icon_Tu
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.3
+        inSlope: 5.0028434
+        outSlope: 5.0028434
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.25832236
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        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: Icon_Tu
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.3
+        inSlope: 4.861043
+        outSlope: 4.861043
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.35058036
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        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: Icon_Tu
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.16666667
+        value: 1
+        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_Alpha
+    path: myImage
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.083333336
+        value: 1
+        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_Color.a
+    path: Icon_Tu
+    classID: 114
+    script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+    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/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Cy9LvC2vUi0ObRdoCQMywGXK6IbhlKCbFbOWAIn/HDstmyt4p9c/jqpEmCqQ
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 10
Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab

@@ -158,7 +158,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -477,18 +477,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2225688117431386680}
-  m_LocalRotation: {x: -0, y: -0, z: -0.3291306, w: 0.94428444}
+  m_LocalRotation: {x: 0, y: 0, z: -0.258819, w: 0.9659259}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 475623016777946934}
   m_Father: {fileID: 3856099267002940727}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -38.432}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -30}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 50.7, y: 67}
-  m_SizeDelta: {x: 52.7957, y: 25.5}
+  m_SizeDelta: {x: 64, y: 32}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5486322802044342715
 CanvasRenderer:
@@ -511,7 +511,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.7971634, b: 0, a: 1}
+  m_Color: {r: 0.7264149, g: 0.2582274, b: 0.15076528, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -609,8 +609,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 23
-    m_FontStyle: 1
+    m_FontSize: 24
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -882,10 +882,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 21
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -893,7 +893,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5FC5\u9009"
+  m_Text: "\u5FC5\u5907"
 --- !u!1 &5542988229873938906
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 3
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab

@@ -124,8 +124,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: 0}
-  m_SizeDelta: {x: 334.3309, y: 62.687}
+  m_AnchoredPosition: {x: 0.0025177002, y: 0}
+  m_SizeDelta: {x: 750, y: 62.687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5710891575198841785
 CanvasRenderer:
@@ -576,7 +576,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

+ 5 - 5
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -1846,7 +1846,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.9433961, g: 0.20024903, b: 0.20024903, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2096,10 +2096,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 29
+    m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:
@@ -3782,7 +3782,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 4907 - 2
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab


+ 14 - 13
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -273,11 +273,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1772753141541214691}
-  m_Father: {fileID: 2859865283014944201}
+  m_Father: {fileID: 8034867944299354957}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 43.04831, y: -946.8596}
+  m_AnchoredPosition: {x: -351.30603, y: 81.694824}
   m_SizeDelta: {x: 563, y: 63.071}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3703191467005982840
@@ -3039,7 +3039,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3106622106931745522}
   - {fileID: 2663430401061570260}
   - {fileID: 5624694180497915839}
   - {fileID: 7058732367293901820}
@@ -3387,6 +3386,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2510253786452685598}
+  - {fileID: 3106622106931745522}
   m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -4581,8 +4581,8 @@ GameObject:
   - component: {fileID: 6830660241309542230}
   - component: {fileID: 8870392335744758782}
   - component: {fileID: 8911828159305465162}
-  - component: {fileID: 1321197118262069093}
   - component: {fileID: 8766603438186958323}
+  - component: {fileID: 4173336186219798395}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4652,7 +4652,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E39\u836F"
---- !u!114 &1321197118262069093
+--- !u!114 &8766603438186958323
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4661,13 +4661,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 7368366197341708070}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.1137255, g: 0.23137257, b: 0.20000002, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &8766603438186958323
+  id: 10267
+--- !u!114 &4173336186219798395
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4676,10 +4674,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 7368366197341708070}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10267
+  effectColor: {r: 0.047393937, g: 0.184, b: 0.1672727, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &7809232107031970724
 GameObject:
   m_ObjectHideFlags: 0
@@ -5353,7 +5354,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

+ 7 - 7
Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -122,10 +122,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 240}
-  m_SizeDelta: {x: 0, y: 60.1647}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -507}
+  m_SizeDelta: {x: 750, y: 60.164673}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8477265740368799667
 CanvasRenderer:
@@ -777,7 +777,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3038665444609316863
 MonoBehaviour:
@@ -3342,7 +3342,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 99.084
+      value: 420.226
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.y
@@ -3350,7 +3350,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 70.107
+      value: 230.678
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y

+ 4 - 4
Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -378,10 +378,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   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: 8, y: 369}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 8, y: -443}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7485414286195926253
 CanvasRenderer:

+ 72 - 9
Assets/Res/UI/ItemDetailsPanel/ItemSourcePanel.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8599819629026832582}
   - component: {fileID: 7897761964867798499}
+  - component: {fileID: 1190279233443032774}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ItemSourcePanel
@@ -30,7 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2569128129379278262}
+  - {fileID: 6504543219591676232}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -77,6 +78,27 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!95 &1190279233443032774
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: d09f5d6c0a1e2d546b73822e4825abd1, 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!1 &1512646988812651499
 GameObject:
   m_ObjectHideFlags: 0
@@ -115,8 +137,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 33.7, y: -206.99994}
-  m_SizeDelta: {x: 487.0498, y: 32.742203}
+  m_AnchoredPosition: {x: 33.7, y: -202}
+  m_SizeDelta: {x: 487.0498, y: 36}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1470563193536367963
 CanvasRenderer:
@@ -139,7 +161,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.854902, g: 0.8352942, b: 0.7803922, a: 1}
+  m_Color: {r: 0.90099996, g: 0.87324333, b: 0.72890896, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -156,7 +178,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: dec_jianbian_tiao2
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -388,7 +410,7 @@ RectTransform:
   - {fileID: 3258887086271990041}
   - {fileID: 5866622043385976589}
   - {fileID: 3059292874867151570}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 6504543219591676232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -554,6 +576,43 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3265464006381433646
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6504543219591676232}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: kz
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6504543219591676232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3265464006381433646}
+  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: 2569128129379278262}
+  m_Father: {fileID: 8599819629026832582}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3888980628067459391
 GameObject:
   m_ObjectHideFlags: 0
@@ -705,7 +764,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.41960785, g: 0.40784314, b: 0.3529412, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -715,7 +774,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -944,7 +1003,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 172.08984}
-  m_SizeDelta: {x: 462.3704, y: 1.9643}
+  m_SizeDelta: {x: 500, y: 1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8123075089451312824
 CanvasRenderer:
@@ -1251,6 +1310,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemGam
       objectReference: {fileID: 0}
+    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

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

@@ -1042,7 +1042,6 @@ RectTransform:
   - {fileID: 3448986095428033778}
   - {fileID: 6705522348014208234}
   - {fileID: 3904336313667662518}
-  - {fileID: 2266508853877018442}
   - {fileID: 3035646753122329493}
   - {fileID: 7892632760807934045}
   - {fileID: 5693100649297059383}
@@ -1285,6 +1284,7 @@ GameObject:
   - component: {fileID: 3904336313667662518}
   - component: {fileID: 5325227394525925118}
   - component: {fileID: 2297732390318598695}
+  - component: {fileID: 1663606713194946654}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_PlacesName
@@ -1304,14 +1304,15 @@ 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: 2266508853877018442}
   m_Father: {fileID: 4534880848114758260}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -203.78177, y: 221.8}
-  m_SizeDelta: {x: -507.6071, y: -798.3508}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 39.4, y: 217.5}
+  m_SizeDelta: {x: 0, y: 61.64917}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5325227394525925118
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1353,7 +1354,21 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5317\u6D77"
+  m_Text: "\u5317\u6D77\u6D77"
+--- !u!114 &1663606713194946654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7375659200628869323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &7911065620788399886
 GameObject:
   m_ObjectHideFlags: 0
@@ -1683,6 +1698,7 @@ GameObject:
   - component: {fileID: 2266508853877018442}
   - component: {fileID: 3013501019931846197}
   - component: {fileID: 2456649883462433114}
+  - component: {fileID: 2770893818892637768}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_PlacesComplteProgress
@@ -1703,13 +1719,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4534880848114758260}
+  m_Father: {fileID: 3904336313667662518}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -75.2, y: 216.5}
-  m_SizeDelta: {x: -442.781, y: -823.39984}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 166.4, y: 0}
+  m_SizeDelta: {x: 163, y: 36.180115}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3013501019931846197
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1752,6 +1768,26 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u63A2\u7D22\u5EA6:0%"
+--- !u!114 &2770893818892637768
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8661358576281957541}
+  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 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -794,7 +794,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: -11.6, y: -1.6}
+  m_AnchoredPosition: {x: -11.6, y: 16}
   m_SizeDelta: {x: 691.4804, y: 160.0778}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6929743905255865244

+ 34 - 2
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -4306,7 +4306,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -10.5, y: -2.8}
+  m_AnchoredPosition: {x: -10.5, y: -21}
   m_SizeDelta: {x: 22, y: 20}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1035588383843407233
@@ -4330,7 +4330,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.7216979, g: 0.7216979, b: 0.7216979, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -5750,6 +5750,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7225379519321823918, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: EmissionModule.rateOverTime.scalar
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7225379519321823918, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.scalar
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 7227907902282158874, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
       propertyPath: m_Enabled
       value: 1
@@ -6186,6 +6194,30 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6477869819010030367, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: InitialModule.startSize.scalar
+      value: 7.49
+      objectReference: {fileID: 0}
+    - target: {fileID: 6477869819010030367, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: InitialModule.startSizeY.scalar
+      value: 2.14
+      objectReference: {fileID: 0}
+    - target: {fileID: 6477869819010030367, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: InitialModule.startColor.maxColor.b
+      value: 0.18752213
+      objectReference: {fileID: 0}
+    - target: {fileID: 6477869819010030367, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: InitialModule.startColor.maxColor.g
+      value: 0.6621655
+      objectReference: {fileID: 0}
+    - target: {fileID: 6477869819010030367, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: InitialModule.startColor.maxColor.r
+      value: 0.8113206
+      objectReference: {fileID: 0}
+    - target: {fileID: 6477869819010030367, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.scalar
+      value: 3
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 69 - 10
Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab

@@ -217,7 +217,7 @@ RectTransform:
   - {fileID: 575745024015913120}
   - {fileID: 5228740560166013104}
   - {fileID: 2932508398742584973}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 750441696350296619}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -856,12 +856,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5936847983662490449}
-  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
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 750441696350296619}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1453,6 +1453,44 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8412400465517279839
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 750441696350296619}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: kz
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &750441696350296619
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8412400465517279839}
+  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: 1
+  m_Children:
+  - {fileID: 7354664618027818273}
+  - {fileID: 9007892658857601612}
+  m_Father: {fileID: 9037135992368401232}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -1463,6 +1501,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9037135992368401232}
   - component: {fileID: 4159330424245520485}
+  - component: {fileID: 90241857546385246}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: QiankundaiInfoPanel
@@ -1483,9 +1522,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7354664618027818273}
-  - {fileID: 9007892658857601612}
   - {fileID: 5811889443116312175}
+  - {fileID: 750441696350296619}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1527,6 +1565,27 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!95 &90241857546385246
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: d09f5d6c0a1e2d546b73822e4825abd1, 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!1 &9211404844896670783
 GameObject:
   m_ObjectHideFlags: 0
@@ -1561,10 +1620,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   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, y: 364}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -448}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2597693103234350293
 CanvasRenderer:
@@ -1597,7 +1656,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40

+ 73 - 14
Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab

@@ -624,7 +624,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7570492002779463511}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -945,10 +945,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   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, y: 364}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -448}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7485414286195926253
 CanvasRenderer:
@@ -981,7 +981,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 40
@@ -1185,6 +1185,45 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &5691466368171958152
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7570492002779463511}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: kz
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7570492002779463511
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5691466368171958152}
+  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: 1
+  m_Children:
+  - {fileID: 7354664618027818273}
+  - {fileID: 6377444699795563280}
+  - {fileID: 4534880848114758260}
+  m_Father: {fileID: 9037135992368401232}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5936847983662490449
 GameObject:
   m_ObjectHideFlags: 0
@@ -1212,12 +1251,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5936847983662490449}
-  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
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7570492002779463511}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1426,7 +1465,7 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 9157969593399644676}
   - {fileID: 5447456535692165012}
@@ -1435,7 +1474,7 @@ RectTransform:
   - {fileID: 827927210870116488}
   - {fileID: 7736911921297942197}
   - {fileID: 3388375637842315206}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7570492002779463511}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1966,6 +2005,7 @@ GameObject:
   m_Component:
   - component: {fileID: 9037135992368401232}
   - component: {fileID: 4159330424245520485}
+  - component: {fileID: 7134424717677997700}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: QiankundaiPanel
@@ -1984,12 +2024,10 @@ RectTransform:
   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_ConstrainProportionsScale: 1
   m_Children:
-  - {fileID: 7354664618027818273}
   - {fileID: 1390114855689535063}
-  - {fileID: 6377444699795563280}
-  - {fileID: 4534880848114758260}
+  - {fileID: 7570492002779463511}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2036,3 +2074,24 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!95 &7134424717677997700
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: d09f5d6c0a1e2d546b73822e4825abd1, 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

+ 12 - 11
Assets/Res/UI/ShopPanel/DaiJinJuanWidget.prefab

@@ -35,8 +35,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -24.5, y: 0}
-  m_SizeDelta: {x: 82.6956, y: 35.1494}
+  m_AnchoredPosition: {x: -4.9, y: -0.40000153}
+  m_SizeDelta: {x: 75.2, y: 34.43}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &1270028895383964650
 CanvasRenderer:
@@ -68,8 +68,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 21
-    m_FontStyle: 1
+    m_FontSize: 24
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 5
     m_MaxSize: 50
@@ -238,7 +238,7 @@ GameObject:
   - component: {fileID: 4703276451515251000}
   - component: {fileID: 3775837197629643911}
   - component: {fileID: 797203704632281785}
-  - component: {fileID: 4943167279969524370}
+  - component: {fileID: 3303284952821232860}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -296,7 +296,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 33
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 5
@@ -308,7 +308,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x648
---- !u!114 &4943167279969524370
+--- !u!114 &3303284952821232860
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -317,12 +317,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 5074442701910679599}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0.6037735, g: 0.25248897, b: 0.07974357, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &7845793044762776776
 GameObject:
   m_ObjectHideFlags: 0

+ 40 - 38
Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -1521,7 +1521,7 @@ 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.19619751, y: -27.414703}
+  m_AnchoredPosition: {x: 0.19619751, y: -27}
   m_SizeDelta: {x: -19.9251, y: -75.9573}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7171448895155585201
@@ -1555,7 +1555,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 43
@@ -1579,8 +1579,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   effectColor: {r: 0, g: 0, b: 0, a: 1}
-  effectDistanceX: 1
-  effectDistanceY: 1
+  effectDistanceX: 2
+  effectDistanceY: 2
   samplingRate: 10
 --- !u!1 &1627423929816216099
 GameObject:
@@ -1872,7 +1872,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -1966,7 +1966,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -2001,8 +2001,8 @@ GameObject:
   - component: {fileID: 6799878124488888821}
   - component: {fileID: 8793441359962076526}
   - component: {fileID: 3868606778493837749}
-  - component: {fileID: 2842507757105308458}
   - component: {fileID: 8212398364123823311}
+  - component: {fileID: 3622919264460162282}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -2027,7 +2027,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: 0, y: 25.5}
+  m_AnchoredPosition: {x: 10.7, y: 19.4}
   m_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8793441359962076526
@@ -2060,10 +2060,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 35
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 9
+    m_MinSize: 4
     m_MaxSize: 43
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -2072,7 +2072,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5341\u8FDE"
---- !u!114 &2842507757105308458
+--- !u!114 &8212398364123823311
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2081,13 +2081,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 3314336736973313898}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!114 &8212398364123823311
+  id: 10234
+--- !u!114 &3622919264460162282
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2096,10 +2094,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 3314336736973313898}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10234
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &3474275561877960227
 GameObject:
   m_ObjectHideFlags: 0
@@ -2822,7 +2823,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 43
@@ -2846,8 +2847,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   effectColor: {r: 0, g: 0, b: 0, a: 1}
-  effectDistanceX: 1
-  effectDistanceY: 1
+  effectDistanceX: 2
+  effectDistanceY: 2
   samplingRate: 10
 --- !u!1 &5089696736954208135
 GameObject:
@@ -3043,8 +3044,8 @@ GameObject:
   - component: {fileID: 2604158547287871528}
   - component: {fileID: 528673476842239041}
   - component: {fileID: 93835371485559685}
-  - component: {fileID: 1748273484820765212}
   - component: {fileID: 4410034090924764247}
+  - component: {fileID: 6562461544779563288}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -3069,7 +3070,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: 0, y: 22.7}
+  m_AnchoredPosition: {x: 0, y: 18}
   m_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &528673476842239041
@@ -3102,10 +3103,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 35
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 9
+    m_MinSize: 4
     m_MaxSize: 43
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -3114,7 +3115,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5355\u62BD"
---- !u!114 &1748273484820765212
+--- !u!114 &4410034090924764247
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3123,13 +3124,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 5405990635821578730}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
---- !u!114 &4410034090924764247
+  id: 10233
+--- !u!114 &6562461544779563288
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3138,10 +3137,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 5405990635821578730}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10233
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &5446121015897482731
 GameObject:
   m_ObjectHideFlags: 0
@@ -3436,7 +3438,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 17.4, y: 10.1}
+  m_AnchoredPosition: {x: 19.1, y: -6.2}
   m_SizeDelta: {x: 46, y: 53}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5414376929399295906
@@ -3530,7 +3532,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: -159.9, y: -262.3}
+  m_AnchoredPosition: {x: -159.9, y: -266}
   m_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8308121774079586848
@@ -4369,7 +4371,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: 169.3, y: -263.5}
+  m_AnchoredPosition: {x: 169.3, y: -266}
   m_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4991873065644050646
@@ -5053,11 +5055,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0.000015258789
+      value: -8.9
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -8.9
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

+ 18 - 18
Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab

@@ -37,8 +37,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 115.51595, y: -23.732}
-  m_SizeDelta: {x: 0, y: 46.2139}
+  m_AnchoredPosition: {x: 119.010956, y: -23.732}
+  m_SizeDelta: {x: 57, y: 46.2139}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5356034030161481726
 CanvasRenderer:
@@ -388,7 +388,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1934165202181370364
 RectTransform:
   m_ObjectHideFlags: 0
@@ -406,7 +406,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 11.8, y: 24.1}
-  m_SizeDelta: {x: 39.0759, y: 39.0759}
+  m_SizeDelta: {x: 62.293, y: 75.2852}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6954625974057336107
 CanvasRenderer:
@@ -527,11 +527,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 55
+    m_FontSize: 58
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 55
+    m_MinSize: 5
+    m_MaxSize: 58
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -608,7 +608,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 36
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MaxSize: 48
@@ -1071,7 +1071,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: -9.99
+  m_Spacing: -3
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -1114,8 +1114,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: -38.7, y: 2.3150024}
-  m_SizeDelta: {x: 19.1718, y: 22.7223}
+  m_AnchoredPosition: {x: -33.9, y: 7.6}
+  m_SizeDelta: {x: 60.5132, y: 68.9188}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8456850588483809624
 CanvasRenderer:
@@ -1155,14 +1155,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_chouka_suipian
+  _icon_name: icon_suipian
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: chouka
-    packgJsonPath: /Art/UIAssets/TextrueJson\chouka.txt
-    packgSpritePath: Assets/Res/UIAtlas/chouka.spriteatlasv2
-    lasetJsonGUID: d884f25912221810fe344e7b1e77ccc2
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: d0066cb0ef604bbd9d9c5b581027eebb
   imageH: 78.167946
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1293,7 +1293,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 3.5, y: 48.7}
-  m_SizeDelta: {x: 27.5885, y: 27.5885}
+  m_SizeDelta: {x: 45.6932, y: 58.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6125417801808295866
 CanvasRenderer:

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

@@ -441,7 +441,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 2518, y: -1942}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 1200, y: 1241}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6128091390146622782
 MonoBehaviour:

+ 5 - 5
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -947,7 +947,6 @@ RectTransform:
   - {fileID: 1062516556747891371}
   - {fileID: 5964692562241983256}
   - {fileID: 1219834969852229682}
-  - {fileID: 918016307754855288}
   - {fileID: 2507585154746067127}
   - {fileID: 1896441137542441893}
   m_Father: {fileID: 0}
@@ -2956,11 +2955,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 499061870556061026}
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 2507585154746067127}
   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: 268.2, y: -318.1}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 220.95001, y: 51.5}
   m_SizeDelta: {x: 152, y: 44.253418}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9009643693355444852
@@ -3994,6 +3993,7 @@ RectTransform:
   m_Children:
   - {fileID: 3289851963449376272}
   - {fileID: 3549792637730888341}
+  - {fileID: 918016307754855288}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}

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

@@ -132,7 +132,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 542.1544, y: 44}
+  m_SizeDelta: {x: 542.1544, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 CanvasRenderer:
@@ -155,7 +155,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.30588236, g: 0.42352945, b: 0.37254903, a: 1}
+  m_Color: {r: 0.962264, g: 0.9191329, b: 0.79432166, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -172,7 +172,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_miaobian3
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -324,7 +324,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8617602873264636042
 RectTransform:
   m_ObjectHideFlags: 0
@@ -506,7 +506,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.49411768, g: 0.5137255, b: 0.48235297, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -515,8 +515,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -526,7 +526,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: "\u8FD9\u662F\u4E00\u4E2A\u63CF\u8FF0\u8FD9\u662F\u8FD9\u662F\u4E00"
+  m_Text: "\u8FD9\u662F\u4E00\u4E2A\u63CF\u8FF0\u8FD9\u662F\u8FD9\u662F\u4E00\u6211"
 --- !u!114 &4427224063004206928
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 251 - 0
Assets/Res/UI/UIanima/UIanimaKzOpen.anim

@@ -0,0 +1,251 @@
+%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: UIanimaKzOpen
+  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: 0.8, y: 0.8, z: 0.8}
+        inSlope: {x: 1.5386347, y: 1.5472171, z: 1.5516932}
+        outSlope: {x: 1.5386347, y: 1.5472171, z: 1.5516932}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.32806724, y: 0.29804805, z: 0.39668262}
+      - serializedVersion: 3
+        time: 0.2
+        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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: kz
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        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_Color.a
+    path: Text (Legacy)
+    classID: 114
+    script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+    flags: 0
+  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: 1996503217
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3763599388
+      attribute: 304273561
+      script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+      typeID: 114
+      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: 0.2
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    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: 0.8
+        inSlope: 1.5386347
+        outSlope: 1.5386347
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.32806724
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        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: kz
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.8
+        inSlope: 1.5472171
+        outSlope: 1.5472171
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.29804805
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        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: kz
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.8
+        inSlope: 1.5516932
+        outSlope: 1.5516932
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.39668262
+      - serializedVersion: 3
+        time: 0.2
+        value: 1
+        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: kz
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 1
+        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_Color.a
+    path: Text (Legacy)
+    classID: 114
+    script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+    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/UIanima/UIanimaKzOpen.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BilOtyiqVXoAesvqzYaNvTB9buGKP9eL+sqLLKQ3/DlGFnDjZTMOaIswIDPk
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 72 - 0
Assets/Res/UI/UIanima/UIanimaScale1.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1102 &-1862657872867266371
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: open
+  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: 9ca22761a68de8847814bce6d28832cd, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: UIanimaScale1
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 4449111408679450263}
+    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!1107 &4449111408679450263
+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: -1862657872867266371}
+    m_Position: {x: 150.00003, y: 420.50006, 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: -1862657872867266371}

+ 8 - 0
Assets/Res/UI/UIanima/UIanimaScale1.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: W3oW4y/5VSg6b1xwPt7+H8ue5Zw+r5a3/V9zzYjxwJ8DHeBD4JHkzEfg2Hr/
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 4
Assets/Res/UI/WidgetItem.prefab

@@ -534,8 +534,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: 19.04669, y: -34.6}
-  m_SizeDelta: {x: 45.5871, y: 25.5237}
+  m_AnchoredPosition: {x: -6.9, y: -33.979}
+  m_SizeDelta: {x: 101.4629, y: 25.5237}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3511437002229949790
 CanvasRenderer:
@@ -566,7 +566,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
@@ -578,7 +578,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 3
+  m_Text: "3333.33\u4E07"
 --- !u!114 &3965198821937596680
 MonoBehaviour:
   m_ObjectHideFlags: 0

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov