浏览代码

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

lzx 1 天之前
父节点
当前提交
fcdc708519
共有 38 个文件被更改,包括 7250 次插入1250 次删除
  1. 二进制
      Assets/Art/UIAssets/decorate/dec_tupochenggong.png
  2. 2 2
      Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat
  3. 377 0
      Assets/Art/VFX/preview_timeline/tupo cg.playable
  4. 8 0
      Assets/Art/VFX/preview_timeline/tupo cg.playable.meta
  5. 377 592
      Assets/Art/cs3.scene
  6. 148 148
      Assets/Res/Config/LanguageChineseConfig.json
  7. 12 12
      Assets/Res/UI/BackgroundPanel/open.anim
  8. 7 7
      Assets/Res/UI/DivineSence/SkipToWidget.prefab
  9. 72 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller
  10. 8 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanel.controller.meta
  11. 320 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim
  12. 8 0
      Assets/Res/UI/HeroInformainPanel/Animator/HeroBreakthroughSuccessPanelopen.anim.meta
  13. 10 10
      Assets/Res/UI/HeroInformainPanel/BreakthroughItemWidget.prefab
  14. 4 4
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab
  15. 4907 2
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab
  16. 41 40
      Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab
  17. 72 9
      Assets/Res/UI/ItemDetailsPanel/ItemSourcePanel.prefab
  18. 34 2
      Assets/Res/UI/MainPanel/MainPanel.prefab
  19. 65 6
      Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab
  20. 69 10
      Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab
  21. 12 11
      Assets/Res/UI/ShopPanel/DaiJinJuanWidget.prefab
  22. 40 38
      Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab
  23. 18 18
      Assets/Res/UI/ShopPanel/ShopItemWidgetType2.prefab
  24. 8 8
      Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab
  25. 251 0
      Assets/Res/UI/UIanima/UIanimaKzOpen.anim
  26. 8 0
      Assets/Res/UI/UIanima/UIanimaKzOpen.anim.meta
  27. 72 0
      Assets/Res/UI/UIanima/UIanimaScale1.controller
  28. 8 0
      Assets/Res/UI/UIanima/UIanimaScale1.controller.meta
  29. 0 0
      Assets/StreamingAssets/assetConfig.txt
  30. 二进制
      Excel2Json/Excel/EventConfig.xlsx
  31. 二进制
      Excel2Json/Excel/HeroModel.xlsx
  32. 二进制
      Excel2Json/Excel/HeroPowerUp.xlsx
  33. 二进制
      Excel2Json/Excel/Item.xlsx
  34. 二进制
      Excel2Json/Excel/Language.xlsx
  35. 二进制
      Excel2Json/Excel/修仙游戏数据规划表.xlsx
  36. 292 331
      UserSettings/Layouts/default-2022.dwlt
  37. 二进制
      美术/art_use_ui/jingjie/dec_tupochenggong.png
  38. 二进制
      美术/unity_use_ui/decorate/dec_tupochenggong.png

二进制
Assets/Art/UIAssets/decorate/dec_tupochenggong.png


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

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.21448165
+    - _Alpha: 0.009973586
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.19479764
+    - _MainTexOffsetU: 0.55235326
     - _MainTexOffsetV: 0
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingU: 0.8
     - _MainTilingV: 1
     - _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: 

文件差异内容过多而无法显示
+ 377 - 592
Assets/Art/cs3.scene


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

@@ -13366,7 +13366,7 @@
     },
     },
     {
     {
       "ID": 4082,
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 4083,
       "ID": 4083,
@@ -13402,7 +13402,7 @@
     },
     },
     {
     {
       "ID": 4091,
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 4092,
       "ID": 4092,
@@ -13438,7 +13438,7 @@
     },
     },
     {
     {
       "ID": 4100,
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 4101,
       "ID": 4101,
@@ -39214,579 +39214,579 @@
     },
     },
     {
     {
       "ID": 10544,
       "ID": 10544,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10545,
       "ID": 10545,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10546,
       "ID": 10546,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10547,
       "ID": 10547,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10548,
       "ID": 10548,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10549,
       "ID": 10549,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10550,
       "ID": 10550,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10551,
       "ID": 10551,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10552,
       "ID": 10552,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10553,
       "ID": 10553,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10554,
       "ID": 10554,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10555,
       "ID": 10555,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10556,
       "ID": 10556,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10557,
       "ID": 10557,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10558,
       "ID": 10558,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10559,
       "ID": 10559,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10560,
       "ID": 10560,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10561,
       "ID": 10561,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10562,
       "ID": 10562,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10563,
       "ID": 10563,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10564,
       "ID": 10564,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10565,
       "ID": 10565,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10566,
       "ID": 10566,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10567,
       "ID": 10567,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10568,
       "ID": 10568,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10569,
       "ID": 10569,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10570,
       "ID": 10570,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10571,
       "ID": 10571,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10572,
       "ID": 10572,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10573,
       "ID": 10573,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10574,
       "ID": 10574,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10575,
       "ID": 10575,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10576,
       "ID": 10576,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10577,
       "ID": 10577,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10578,
       "ID": 10578,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10579,
       "ID": 10579,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10580,
       "ID": 10580,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10581,
       "ID": 10581,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10582,
       "ID": 10582,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10583,
       "ID": 10583,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10584,
       "ID": 10584,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10585,
       "ID": 10585,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10586,
       "ID": 10586,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10587,
       "ID": 10587,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10588,
       "ID": 10588,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10589,
       "ID": 10589,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10590,
       "ID": 10590,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10591,
       "ID": 10591,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10592,
       "ID": 10592,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10593,
       "ID": 10593,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10594,
       "ID": 10594,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10595,
       "ID": 10595,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10596,
       "ID": 10596,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10597,
       "ID": 10597,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10598,
       "ID": 10598,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10599,
       "ID": 10599,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10600,
       "ID": 10600,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10601,
       "ID": 10601,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10602,
       "ID": 10602,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10603,
       "ID": 10603,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10604,
       "ID": 10604,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10605,
       "ID": 10605,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10606,
       "ID": 10606,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10607,
       "ID": 10607,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10608,
       "ID": 10608,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10609,
       "ID": 10609,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10610,
       "ID": 10610,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10611,
       "ID": 10611,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10612,
       "ID": 10612,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10613,
       "ID": 10613,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10614,
       "ID": 10614,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10615,
       "ID": 10615,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10616,
       "ID": 10616,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10617,
       "ID": 10617,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10618,
       "ID": 10618,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10619,
       "ID": 10619,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10620,
       "ID": 10620,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10621,
       "ID": 10621,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10622,
       "ID": 10622,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10623,
       "ID": 10623,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10624,
       "ID": 10624,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10625,
       "ID": 10625,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10626,
       "ID": 10626,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10627,
       "ID": 10627,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10628,
       "ID": 10628,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10629,
       "ID": 10629,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10630,
       "ID": 10630,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10631,
       "ID": 10631,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10632,
       "ID": 10632,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10633,
       "ID": 10633,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10634,
       "ID": 10634,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10635,
       "ID": 10635,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10636,
       "ID": 10636,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10637,
       "ID": 10637,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10638,
       "ID": 10638,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10639,
       "ID": 10639,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10640,
       "ID": 10640,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10641,
       "ID": 10641,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10642,
       "ID": 10642,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10643,
       "ID": 10643,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10644,
       "ID": 10644,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10645,
       "ID": 10645,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10646,
       "ID": 10646,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10647,
       "ID": 10647,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10648,
       "ID": 10648,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10649,
       "ID": 10649,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10650,
       "ID": 10650,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10651,
       "ID": 10651,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10652,
       "ID": 10652,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10653,
       "ID": 10653,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10654,
       "ID": 10654,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10655,
       "ID": 10655,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10656,
       "ID": 10656,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10657,
       "ID": 10657,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10658,
       "ID": 10658,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10659,
       "ID": 10659,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10660,
       "ID": 10660,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10661,
       "ID": 10661,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10662,
       "ID": 10662,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10663,
       "ID": 10663,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10664,
       "ID": 10664,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10665,
       "ID": 10665,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10666,
       "ID": 10666,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10667,
       "ID": 10667,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10668,
       "ID": 10668,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10669,
       "ID": 10669,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10670,
       "ID": 10670,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10671,
       "ID": 10671,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10672,
       "ID": 10672,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10673,
       "ID": 10673,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10674,
       "ID": 10674,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10675,
       "ID": 10675,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10676,
       "ID": 10676,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10677,
       "ID": 10677,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10678,
       "ID": 10678,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10679,
       "ID": 10679,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10680,
       "ID": 10680,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10681,
       "ID": 10681,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10682,
       "ID": 10682,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10683,
       "ID": 10683,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10684,
       "ID": 10684,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10685,
       "ID": 10685,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10686,
       "ID": 10686,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10687,
       "ID": 10687,
-      "txt": "0"
+      "txt": ""
     },
     },
     {
     {
       "ID": 10688,
       "ID": 10688,
@@ -39846,7 +39846,7 @@
     },
     },
     {
     {
       "ID": 10702,
       "ID": 10702,
-      "txt": "占位"
+      "txt": "赠送给道友,提升{0}点心情值。"
     },
     },
     {
     {
       "ID": 10703,
       "ID": 10703,

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

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

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

@@ -57,13 +57,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 552283852197464311}
   m_GameObject: {fileID: 552283852197464311}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -171,7 +171,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -188,7 +188,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_miaobian3
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
@@ -260,7 +260,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -349,7 +349,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -358,7 +358,7 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
+    m_FontSize: 28
     m_FontStyle: 0
     m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2

+ 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_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
@@ -477,18 +477,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2225688117431386680}
   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_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 475623016777946934}
   - {fileID: 475623016777946934}
   m_Father: {fileID: 3856099267002940727}
   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_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 50.7, y: 67}
   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}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5486322802044342715
 --- !u!222 &5486322802044342715
 CanvasRenderer:
 CanvasRenderer:
@@ -511,7 +511,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -609,8 +609,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 23
-    m_FontStyle: 1
+    m_FontSize: 24
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
@@ -882,10 +882,10 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 21
+    m_FontSize: 26
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
     m_Alignment: 4
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
@@ -893,7 +893,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
-  m_Text: "\u5FC5\u9009"
+  m_Text: "\u5FC5\u5907"
 --- !u!1 &5542988229873938906
 --- !u!1 &5542988229873938906
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

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

@@ -1846,7 +1846,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -2096,10 +2096,10 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 29
+    m_FontSize: 30
     m_FontStyle: 0
     m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_MaxSize: 40
     m_Alignment: 4
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
@@ -3782,7 +3782,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 --- !u!114 &4159330424245520485
 MonoBehaviour:
 MonoBehaviour:

文件差异内容过多而无法显示
+ 4907 - 2
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab


+ 41 - 40
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -405,9 +405,9 @@ RectTransform:
   - {fileID: 7919928200524859861}
   - {fileID: 7919928200524859861}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 561.5101, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &577437548784921467
 --- !u!222 &577437548784921467
@@ -630,9 +630,9 @@ RectTransform:
   - {fileID: 3175515234904838256}
   - {fileID: 3175515234904838256}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 18, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &404717448016885080
 --- !u!222 &404717448016885080
@@ -959,9 +959,9 @@ RectTransform:
   - {fileID: 6349527074189271333}
   - {fileID: 6349527074189271333}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 319.95, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2045175675939122853
 --- !u!222 &2045175675939122853
@@ -1636,7 +1636,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -281.5}
   m_AnchoredPosition: {x: 0, y: -281.5}
-  m_SizeDelta: {x: 579.5101, y: 75.23102}
+  m_SizeDelta: {x: 0, y: 75.23102}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7270342452893677775
 --- !u!222 &7270342452893677775
 CanvasRenderer:
 CanvasRenderer:
@@ -1720,9 +1720,9 @@ RectTransform:
   - {fileID: 1342635920967882127}
   - {fileID: 1342635920967882127}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 440.73004, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3935559908781618714
 --- !u!222 &3935559908781618714
@@ -2154,9 +2154,9 @@ RectTransform:
   - {fileID: 4783036684135195832}
   - {fileID: 4783036684135195832}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 380.34003, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1103223725134899825
 --- !u!222 &1103223725134899825
@@ -3187,9 +3187,9 @@ RectTransform:
   - {fileID: 8003730315462188263}
   - {fileID: 8003730315462188263}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 138.78, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1434731699087089794
 --- !u!222 &1434731699087089794
@@ -4122,9 +4122,9 @@ RectTransform:
   - {fileID: 8747249840944031461}
   - {fileID: 8747249840944031461}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 199.17, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8487238967615647820
 --- !u!222 &8487238967615647820
@@ -4212,9 +4212,9 @@ RectTransform:
   - {fileID: 4272035499011951705}
   - {fileID: 4272035499011951705}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 78.39, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3120351680176860633
 --- !u!222 &3120351680176860633
@@ -4418,9 +4418,9 @@ RectTransform:
   - {fileID: 2071376250323884100}
   - {fileID: 2071376250323884100}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 501.12006, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7125985836412029960
 --- !u!222 &7125985836412029960
@@ -4581,8 +4581,8 @@ GameObject:
   - component: {fileID: 6830660241309542230}
   - component: {fileID: 6830660241309542230}
   - component: {fileID: 8870392335744758782}
   - component: {fileID: 8870392335744758782}
   - component: {fileID: 8911828159305465162}
   - component: {fileID: 8911828159305465162}
-  - component: {fileID: 1321197118262069093}
   - component: {fileID: 8766603438186958323}
   - component: {fileID: 8766603438186958323}
+  - component: {fileID: 4173336186219798395}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
   m_Name: Text (Legacy)
@@ -4652,7 +4652,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "\u4E39\u836F"
   m_Text: "\u4E39\u836F"
---- !u!114 &1321197118262069093
+--- !u!114 &8766603438186958323
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4661,13 +4661,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 7368366197341708070}
   m_GameObject: {fileID: 7368366197341708070}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   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:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4676,10 +4674,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 7368366197341708070}
   m_GameObject: {fileID: 7368366197341708070}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   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
 --- !u!1 &7809232107031970724
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -4943,9 +4944,9 @@ RectTransform:
   - {fileID: 2351084085639383589}
   - {fileID: 2351084085639383589}
   m_Father: {fileID: 3296466721338208283}
   m_Father: {fileID: 3296466721338208283}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 259.56, y: -23}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 36, y: 46}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2379505165480288718
 --- !u!222 &2379505165480288718

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

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 8599819629026832582}
   - component: {fileID: 8599819629026832582}
   - component: {fileID: 7897761964867798499}
   - component: {fileID: 7897761964867798499}
+  - component: {fileID: 1190279233443032774}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: ItemSourcePanel
   m_Name: ItemSourcePanel
@@ -30,7 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
-  - {fileID: 2569128129379278262}
+  - {fileID: 6504543219591676232}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -77,6 +78,27 @@ MonoBehaviour:
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
   isAssetBundle: 1
   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
 --- !u!1 &1512646988812651499
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -115,8 +137,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {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}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1470563193536367963
 --- !u!222 &1470563193536367963
 CanvasRenderer:
 CanvasRenderer:
@@ -139,7 +161,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -156,7 +178,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang
+  _icon_name: dec_jianbian_tiao2
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
@@ -388,7 +410,7 @@ RectTransform:
   - {fileID: 3258887086271990041}
   - {fileID: 3258887086271990041}
   - {fileID: 5866622043385976589}
   - {fileID: 5866622043385976589}
   - {fileID: 3059292874867151570}
   - {fileID: 3059292874867151570}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 6504543219591676232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -554,6 +576,43 @@ MonoBehaviour:
   m_OnValueChanged:
   m_OnValueChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       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
 --- !u!1 &3888980628067459391
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -705,7 +764,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -715,7 +774,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
@@ -944,7 +1003,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 172.08984}
   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}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8123075089451312824
 --- !u!222 &8123075089451312824
 CanvasRenderer:
 CanvasRenderer:
@@ -1251,6 +1310,10 @@ PrefabInstance:
       propertyPath: m_Name
       propertyPath: m_Name
       value: WidgetItemGam
       value: WidgetItemGam
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
+    - target: {fileID: 8408847998961895963, guid: cadded2fa3ee99949a502d052905a655, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []

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

@@ -4306,7 +4306,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {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_SizeDelta: {x: 22, y: 20}
   m_Pivot: {x: 1, y: 0.5}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1035588383843407233
 --- !u!222 &1035588383843407233
@@ -4330,7 +4330,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -5750,6 +5750,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 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}
     - target: {fileID: 7227907902282158874, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
       propertyPath: m_Enabled
       propertyPath: m_Enabled
       value: 1
       value: 1
@@ -6186,6 +6194,30 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       propertyPath: m_SortingLayer
       value: 0
       value: 0
       objectReference: {fileID: 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_RemovedComponents: []
     m_RemovedGameObjects: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedGameObjects: []

+ 65 - 6
Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab

@@ -217,7 +217,7 @@ RectTransform:
   - {fileID: 575745024015913120}
   - {fileID: 575745024015913120}
   - {fileID: 5228740560166013104}
   - {fileID: 5228740560166013104}
   - {fileID: 2932508398742584973}
   - {fileID: 2932508398742584973}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 750441696350296619}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -856,12 +856,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5936847983662490449}
   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_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 750441696350296619}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1453,6 +1453,44 @@ MonoBehaviour:
   m_OnClick:
   m_OnClick:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       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
 --- !u!1 &8994874510214016950
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1463,6 +1501,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 9037135992368401232}
   - component: {fileID: 9037135992368401232}
   - component: {fileID: 4159330424245520485}
   - component: {fileID: 4159330424245520485}
+  - component: {fileID: 90241857546385246}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: QiankundaiInfoPanel
   m_Name: QiankundaiInfoPanel
@@ -1483,9 +1522,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
-  - {fileID: 7354664618027818273}
-  - {fileID: 9007892658857601612}
   - {fileID: 5811889443116312175}
   - {fileID: 5811889443116312175}
+  - {fileID: 750441696350296619}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1527,6 +1565,27 @@ MonoBehaviour:
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
   isAssetBundle: 0
   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
 --- !u!1 &9211404844896670783
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1597,7 +1656,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 32
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MinSize: 3
     m_MaxSize: 40
     m_MaxSize: 40

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

@@ -624,7 +624,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7570492002779463511}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -981,7 +981,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 32
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MinSize: 3
     m_MaxSize: 40
     m_MaxSize: 40
@@ -1185,6 +1185,45 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
   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
 --- !u!1 &5936847983662490449
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1212,12 +1251,12 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5936847983662490449}
   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_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7570492002779463511}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {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_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   m_Children:
   - {fileID: 9157969593399644676}
   - {fileID: 9157969593399644676}
   - {fileID: 5447456535692165012}
   - {fileID: 5447456535692165012}
@@ -1435,7 +1474,7 @@ RectTransform:
   - {fileID: 827927210870116488}
   - {fileID: 827927210870116488}
   - {fileID: 7736911921297942197}
   - {fileID: 7736911921297942197}
   - {fileID: 3388375637842315206}
   - {fileID: 3388375637842315206}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 7570492002779463511}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1966,6 +2005,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 9037135992368401232}
   - component: {fileID: 9037135992368401232}
   - component: {fileID: 4159330424245520485}
   - component: {fileID: 4159330424245520485}
+  - component: {fileID: 7134424717677997700}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: QiankundaiPanel
   m_Name: QiankundaiPanel
@@ -1984,12 +2024,10 @@ RectTransform:
   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_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   m_Children:
-  - {fileID: 7354664618027818273}
   - {fileID: 1390114855689535063}
   - {fileID: 1390114855689535063}
-  - {fileID: 6377444699795563280}
-  - {fileID: 4534880848114758260}
+  - {fileID: 7570492002779463511}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2036,3 +2074,24 @@ MonoBehaviour:
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
   isAssetBundle: 0
   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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {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}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &1270028895383964650
 --- !u!222 &1270028895383964650
 CanvasRenderer:
 CanvasRenderer:
@@ -68,8 +68,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 21
-    m_FontStyle: 1
+    m_FontSize: 24
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 5
     m_MinSize: 5
     m_MaxSize: 50
     m_MaxSize: 50
@@ -238,7 +238,7 @@ GameObject:
   - component: {fileID: 4703276451515251000}
   - component: {fileID: 4703276451515251000}
   - component: {fileID: 3775837197629643911}
   - component: {fileID: 3775837197629643911}
   - component: {fileID: 797203704632281785}
   - component: {fileID: 797203704632281785}
-  - component: {fileID: 4943167279969524370}
+  - component: {fileID: 3303284952821232860}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: Text_Count
   m_Name: Text_Count
@@ -296,7 +296,7 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 33
+    m_FontSize: 36
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 5
     m_MinSize: 5
@@ -308,7 +308,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: x648
   m_Text: x648
---- !u!114 &4943167279969524370
+--- !u!114 &3303284952821232860
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -317,12 +317,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 5074442701910679599}
   m_GameObject: {fileID: 5074442701910679599}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   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
 --- !u!1 &7845793044762776776
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   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_SizeDelta: {x: -19.9251, y: -75.9573}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7171448895155585201
 --- !u!222 &7171448895155585201
@@ -1555,7 +1555,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
     m_FontSize: 24
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 43
     m_MaxSize: 43
@@ -1579,8 +1579,8 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   effectColor: {r: 0, g: 0, b: 0, a: 1}
   effectColor: {r: 0, g: 0, b: 0, a: 1}
-  effectDistanceX: 1
-  effectDistanceY: 1
+  effectDistanceX: 2
+  effectDistanceY: 2
   samplingRate: 10
   samplingRate: 10
 --- !u!1 &1627423929816216099
 --- !u!1 &1627423929816216099
 GameObject:
 GameObject:
@@ -1872,7 +1872,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
@@ -1966,7 +1966,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MinSize: 2
     m_MaxSize: 40
     m_MaxSize: 40
@@ -2001,8 +2001,8 @@ GameObject:
   - component: {fileID: 6799878124488888821}
   - component: {fileID: 6799878124488888821}
   - component: {fileID: 8793441359962076526}
   - component: {fileID: 8793441359962076526}
   - component: {fileID: 3868606778493837749}
   - component: {fileID: 3868606778493837749}
-  - component: {fileID: 2842507757105308458}
   - component: {fileID: 8212398364123823311}
   - component: {fileID: 8212398364123823311}
+  - component: {fileID: 3622919264460162282}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: tt (1)
   m_Name: tt (1)
@@ -2027,7 +2027,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {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_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8793441359962076526
 --- !u!222 &8793441359962076526
@@ -2060,10 +2060,10 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 35
+    m_FontSize: 40
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 9
+    m_MinSize: 4
     m_MaxSize: 43
     m_MaxSize: 43
     m_Alignment: 4
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
@@ -2072,7 +2072,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "\u5341\u8FDE"
   m_Text: "\u5341\u8FDE"
---- !u!114 &2842507757105308458
+--- !u!114 &8212398364123823311
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2081,13 +2081,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 3314336736973313898}
   m_GameObject: {fileID: 3314336736973313898}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   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:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2096,10 +2094,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 3314336736973313898}
   m_GameObject: {fileID: 3314336736973313898}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  id: 10234
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &3474275561877960227
 --- !u!1 &3474275561877960227
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2822,7 +2823,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
     m_FontSize: 24
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MinSize: 3
     m_MaxSize: 43
     m_MaxSize: 43
@@ -2846,8 +2847,8 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   effectColor: {r: 0, g: 0, b: 0, a: 1}
   effectColor: {r: 0, g: 0, b: 0, a: 1}
-  effectDistanceX: 1
-  effectDistanceY: 1
+  effectDistanceX: 2
+  effectDistanceY: 2
   samplingRate: 10
   samplingRate: 10
 --- !u!1 &5089696736954208135
 --- !u!1 &5089696736954208135
 GameObject:
 GameObject:
@@ -3043,8 +3044,8 @@ GameObject:
   - component: {fileID: 2604158547287871528}
   - component: {fileID: 2604158547287871528}
   - component: {fileID: 528673476842239041}
   - component: {fileID: 528673476842239041}
   - component: {fileID: 93835371485559685}
   - component: {fileID: 93835371485559685}
-  - component: {fileID: 1748273484820765212}
   - component: {fileID: 4410034090924764247}
   - component: {fileID: 4410034090924764247}
+  - component: {fileID: 6562461544779563288}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: tt
   m_Name: tt
@@ -3069,7 +3070,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {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_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &528673476842239041
 --- !u!222 &528673476842239041
@@ -3102,10 +3103,10 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 35
+    m_FontSize: 40
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 9
+    m_MinSize: 4
     m_MaxSize: 43
     m_MaxSize: 43
     m_Alignment: 4
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
@@ -3114,7 +3115,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "\u5355\u62BD"
   m_Text: "\u5355\u62BD"
---- !u!114 &1748273484820765212
+--- !u!114 &4410034090924764247
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3123,13 +3124,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 5405990635821578730}
   m_GameObject: {fileID: 5405990635821578730}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   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:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3138,10 +3137,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 5405990635821578730}
   m_GameObject: {fileID: 5405990635821578730}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  id: 10233
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 10
 --- !u!1 &5446121015897482731
 --- !u!1 &5446121015897482731
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -3436,7 +3438,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {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_SizeDelta: {x: 46, y: 53}
   m_Pivot: {x: 0, y: 1}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5414376929399295906
 --- !u!222 &5414376929399295906
@@ -3530,7 +3532,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {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_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8308121774079586848
 --- !u!222 &8308121774079586848
@@ -4369,7 +4371,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {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_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4991873065644050646
 --- !u!222 &4991873065644050646
@@ -5053,11 +5055,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
       propertyPath: m_AnchoredPosition.x
       propertyPath: m_AnchoredPosition.x
-      value: 0.000015258789
+      value: -8.9
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -8.9
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
     - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {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}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5356034030161481726
 --- !u!222 &5356034030161481726
 CanvasRenderer:
 CanvasRenderer:
@@ -388,7 +388,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1934165202181370364
 --- !u!224 &1934165202181370364
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -406,7 +406,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 11.8, y: 24.1}
   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}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6954625974057336107
 --- !u!222 &6954625974057336107
 CanvasRenderer:
 CanvasRenderer:
@@ -527,11 +527,11 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 55
+    m_FontSize: 58
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 55
+    m_MinSize: 5
+    m_MaxSize: 58
     m_Alignment: 4
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_RichText: 1
@@ -608,7 +608,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 36
     m_FontSize: 36
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 3
     m_MinSize: 3
     m_MaxSize: 48
     m_MaxSize: 48
@@ -1071,7 +1071,7 @@ MonoBehaviour:
     m_Top: 0
     m_Top: 0
     m_Bottom: 0
     m_Bottom: 0
   m_ChildAlignment: 4
   m_ChildAlignment: 4
-  m_Spacing: -9.99
+  m_Spacing: -3
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
   m_ChildControlWidth: 0
@@ -1114,8 +1114,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {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}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8456850588483809624
 --- !u!222 &8456850588483809624
 CanvasRenderer:
 CanvasRenderer:
@@ -1155,14 +1155,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_chouka_suipian
+  _icon_name: icon_suipian
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 425a9eab85b24b74b81413be06f42b76, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
   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
   imageH: 78.167946
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -1293,7 +1293,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 3.5, y: 48.7}
   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}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6125417801808295866
 --- !u!222 &6125417801808295866
 CanvasRenderer:
 CanvasRenderer:

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

@@ -132,7 +132,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   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}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 --- !u!222 &607144206561970494
 CanvasRenderer:
 CanvasRenderer:
@@ -155,7 +155,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -172,7 +172,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_miaobian3
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
@@ -324,7 +324,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8617602873264636042
 --- !u!224 &8617602873264636042
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -506,7 +506,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   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_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -515,8 +515,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
@@ -526,7 +526,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 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
 --- !u!114 &4427224063004206928
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   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: 

文件差异内容过多而无法显示
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


二进制
Excel2Json/Excel/EventConfig.xlsx


二进制
Excel2Json/Excel/HeroModel.xlsx


二进制
Excel2Json/Excel/HeroPowerUp.xlsx


二进制
Excel2Json/Excel/Item.xlsx


二进制
Excel2Json/Excel/Language.xlsx


二进制
Excel2Json/Excel/修仙游戏数据规划表.xlsx


文件差异内容过多而无法显示
+ 292 - 331
UserSettings/Layouts/default-2022.dwlt


二进制
美术/art_use_ui/jingjie/dec_tupochenggong.png


二进制
美术/unity_use_ui/decorate/dec_tupochenggong.png


部分文件因为文件数量过多而无法显示