Browse Source

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

DESKTOP-FB72PO8\Administrator 17 hours ago
parent
commit
9798c01995
44 changed files with 7878 additions and 1616 deletions
  1. 8 0
      Assets/Art/Dujie.meta
  2. 3234 564
      Assets/Art/Dujie.scene
  3. BIN
      Assets/Art/Dujie/bg_xiulian.png
  4. 133 0
      Assets/Art/Dujie/bg_xiulian.png.meta
  5. 628 0
      Assets/Art/Dujie/predujie.playable
  6. 8 0
      Assets/Art/Dujie/predujie.playable.meta
  7. BIN
      Assets/Art/Dujie/洞府-修炼.png
  8. 133 0
      Assets/Art/Dujie/洞府-修炼.png.meta
  9. BIN
      Assets/Art/Dujie/渡劫背景1.png
  10. 133 0
      Assets/Art/Dujie/渡劫背景1.png.meta
  11. BIN
      Assets/Art/Dujie/渡劫背景2.png
  12. 133 0
      Assets/Art/Dujie/渡劫背景2.png.meta
  13. 92 0
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat
  14. 8 0
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat.meta
  15. 94 0
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat
  16. 8 0
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat.meta
  17. 707 105
      Assets/Art/cs3.scene
  18. 103 103
      Assets/Res/Config/DivineSenseConfig.json
  19. 469 39
      Assets/Res/Config/DropConfig.json
  20. 45 45
      Assets/Res/Config/EventConfig.json
  21. 3 3
      Assets/Res/Config/GameConstantConfig.json
  22. 112 112
      Assets/Res/Config/HeroPowerUpConfig.json
  23. 112 112
      Assets/Res/Config/ResourceLevelConfig.json
  24. 252 140
      Assets/Res/UI/GuidePanel/GuideHand.prefab
  25. 51 276
      Assets/Res/UI/GuidePanel/GuidePanel.prefab
  26. 492 1
      Assets/Res/UI/GuidePanel/loop.anim
  27. BIN
      Assets/Res/UI/LevelChoosePanel/8222cd423e0f95a409ab3a21db7f52eb.png
  28. 203 0
      Assets/Res/UI/LevelChoosePanel/8222cd423e0f95a409ab3a21db7f52eb.png.meta
  29. 657 100
      Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab
  30. 5 0
      Assets/Scripts/GameData/ExcelConfig/DivineSenseConfig.cs
  31. 1 1
      Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs
  32. 1 1
      Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs
  33. 1 1
      Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs
  34. 2 2
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs
  35. 40 1
      Assets/Scripts/GameUI/UI/ShopPanel/ShopBtnWidget.cs
  36. BIN
      Excel2Json/Excel/ChouKa.xlsx
  37. BIN
      Excel2Json/Excel/DivineSenseConfig.xlsx
  38. BIN
      Excel2Json/Excel/EventConfig.xlsx
  39. BIN
      Excel2Json/Excel/GameConstant.xlsx
  40. BIN
      Excel2Json/Excel/HeroPowerUp.xlsx
  41. BIN
      Excel2Json/Excel/Item.xlsx
  42. BIN
      Excel2Json/Excel/ResourceLevel.xlsx
  43. BIN
      Excel2Json/Excel/修仙游戏数据规划表.xlsx
  44. 10 10
      UserSettings/EditorUserSettings.asset

+ 8 - 0
Assets/Art/Dujie.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CXgavCioAnO2yGZNaKNWYbXRVmlPMUubD3D8nFxQ1KAwb1i+6GvynEB19fd7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 3234 - 564
Assets/Art/Dujie.scene


BIN
Assets/Art/Dujie/bg_xiulian.png


+ 133 - 0
Assets/Art/Dujie/bg_xiulian.png.meta

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

+ 628 - 0
Assets/Art/Dujie/predujie.playable

@@ -0,0 +1,628 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-8059253939872048074
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: Track Group
+  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:
+  - {fileID: 3856996571572413484}
+  - {fileID: -1367102304459462482}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &-5105335223176721355
+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!74 &-1843512312934065743
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Recorded
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 1.7142857, y: 1.7142857, z: 1.7142857}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5833333
+        value: {x: 2, y: 2, z: 2}
+        inSlope: {x: 1.7142857, y: 1.7142857, z: 1.7142857}
+        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: 
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: -2.3076923
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.43333334
+        value: 0
+        inSlope: -2.3076923
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 304273561
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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.5833333
+    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: 1
+        inSlope: 0
+        outSlope: 1.7142857
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5833333
+        value: 2
+        inSlope: 1.7142857
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 1.7142857
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5833333
+        value: 2
+        inSlope: 1.7142857
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 1.7142857
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5833333
+        value: 2
+        inSlope: 1.7142857
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: 
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: -2.3076923
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.43333334
+        value: 0
+        inSlope: -2.3076923
+        outSlope: 0
+        tangentMode: 69
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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
+--- !u!114 &-1367102304459462482
+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 (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -8059253939872048074}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 1
+  m_InfiniteClipPostExtrapolation: 1
+  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: -1310775373331071641}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!74 &-1310775373331071641
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Recorded (1)
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0.89411765
+        inSlope: -0.46203202
+        outSlope: -0.46203202
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.9166667
+        value: 0
+        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: 
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 0
+      attribute: 304273561
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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.9166667
+    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: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0.89411765
+        inSlope: -0.46203202
+        outSlope: -0.46203202
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.9166667
+        value: 0
+        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: 
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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
+--- !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: predujie
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks:
+  - {fileID: 6656762707459004628}
+  - {fileID: -8059253939872048074}
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}
+--- !u!114 &3856996571572413484
+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: -8059253939872048074}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 1
+  m_InfiniteClipPostExtrapolation: 1
+  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: -1843512312934065743}
+  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 &6656762707459004628
+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: -5105335223176721355}
+    m_Duration: 5
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 6656762707459004628}
+    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

+ 8 - 0
Assets/Art/Dujie/predujie.playable.meta

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

BIN
Assets/Art/Dujie/洞府-修炼.png


+ 133 - 0
Assets/Art/Dujie/洞府-修炼.png.meta

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

BIN
Assets/Art/Dujie/渡劫背景1.png


+ 133 - 0
Assets/Art/Dujie/渡劫背景1.png.meta

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

BIN
Assets/Art/Dujie/渡劫背景2.png


+ 133 - 0
Assets/Art/Dujie/渡劫背景2.png.meta

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

+ 92 - 0
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -0,0 +1,92 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_ob_yindao_glow_add
+  m_Shader: {fileID: 4800000, guid: 7d5403880352cd348b8ca3d1f3a67447, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 614d54c567660424497d0b9e73765fac, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 0
+    - _AlphaCutoff: 0.5
+    - _ColorMask: 15
+    - _EnableExternalAlpha: 0
+    - _MainSpeedU: 0.5
+    - _MainSpeedV: 0.5
+    - _MainTexOffsetU: 0
+    - _MainTexOffsetV: 0
+    - _MainTilingU: 1
+    - _MainTilingV: 1
+    - _MaskSpeedU: 0.5
+    - _MaskSpeedV: 0.5
+    - _MaskTexOffsetU: 0
+    - _MaskTexOffsetV: 0
+    - _MaskTilingU: 1
+    - _MaskTilingV: 1
+    - _MaskTimeSpeedON1: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _TimeSpeedON: 0
+    - _UseUIAlphaClip: 0
+    m_Colors:
+    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+    - _Color: {r: 0.8915093, g: 0.23275402, b: 0, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat.meta

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

+ 94 - 0
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -0,0 +1,94 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_ob_yindao_quan
+  m_Shader: {fileID: 4800000, guid: 7d5403880352cd348b8ca3d1f3a67447, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 95e602e250156af468901ae4f4b3fa00, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 0
+    - _AlphaCutoff: 0.5
+    - _ColorMask: 0
+    - _EnableExternalAlpha: 0
+    - _Intensity: 1
+    - _MainSpeedU: 0.5
+    - _MainSpeedV: 0.5
+    - _MainTexOffsetU: 0
+    - _MainTexOffsetV: 0
+    - _MainTexRotation: 0
+    - _MainTilingU: 1
+    - _MainTilingV: 1
+    - _MaskSpeedU: 0.5
+    - _MaskSpeedV: 0.5
+    - _MaskTexOffsetU: 0
+    - _MaskTexOffsetV: 0
+    - _MaskTilingU: 1
+    - _MaskTilingV: 1
+    - _MaskTimeSpeedON1: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _Stencil: 0
+    - _StencilComp: 0
+    - _StencilOp: 0
+    - _StencilReadMask: 0
+    - _StencilWriteMask: 0
+    - _TimeSpeedON: 0
+    - _ca: 1
+    m_Colors:
+    - _Color: {r: 2.0727692, g: 0.957228, b: 0.0782174, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _MainTexChannel: {r: 1, g: 0, b: 0, a: 0}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WikWtXz7AXhjNTWQ2k33IDf2+8p/Vq51mXO9tfrHrCluSLULVovPSLtXEs25
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 707 - 105
Assets/Art/cs3.scene


+ 103 - 103
Assets/Res/Config/DivineSenseConfig.json

@@ -10,254 +10,254 @@
         0.0,
         0.0
       ],
-      "exp": 1000,
+      "exp": 500,
       "MaxNum": 2
     },
     {
       "ID": 2,
       "QualityBonusChance": [
-        685.0,
-        210.0,
-        105.0,
+        676.0,
+        216.0,
+        108.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 3000,
+      "exp": 500,
       "MaxNum": 3
     },
     {
       "ID": 3,
       "QualityBonusChance": [
-        670.0,
-        220.0,
-        110.0,
+        649.0,
+        234.0,
+        117.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 6000,
+      "exp": 500,
       "MaxNum": 4
     },
     {
       "ID": 4,
       "QualityBonusChance": [
-        655.0,
-        230.0,
-        115.0,
+        622.0,
+        252.0,
+        126.0,
         0.0,
         0.0,
         0.0
       ],
-      "exp": 10000,
+      "exp": 500,
       "MaxNum": 5
     },
     {
       "ID": 5,
       "QualityBonusChance": [
-        635.0,
-        240.0,
-        120.0,
-        5.0,
+        595.0,
+        270.0,
+        135.0,
+        0.0,
         0.0,
         0.0
       ],
-      "exp": 15000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 6,
       "QualityBonusChance": [
-        615.0,
-        250.0,
-        125.0,
-        10.0,
+        550.0,
+        288.0,
+        144.0,
+        18.0,
         0.0,
         0.0
       ],
-      "exp": 21000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 7,
       "QualityBonusChance": [
-        595.0,
-        260.0,
-        130.0,
-        15.0,
+        515.0,
+        306.0,
+        153.0,
+        26.0,
         0.0,
         0.0
       ],
-      "exp": 27000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 8,
       "QualityBonusChance": [
-        575.0,
-        270.0,
-        135.0,
-        20.0,
+        480.0,
+        324.0,
+        162.0,
+        34.0,
         0.0,
         0.0
       ],
-      "exp": 33000,
+      "exp": 1000,
       "MaxNum": 6
     },
     {
       "ID": 9,
       "QualityBonusChance": [
-        555.0,
-        280.0,
-        140.0,
-        25.0,
+        445.0,
+        342.0,
+        171.0,
+        42.0,
         0.0,
         0.0
       ],
-      "exp": 39000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 10,
       "QualityBonusChance": [
-        531.0,
-        290.0,
-        145.0,
-        30.0,
-        4.0,
+        410.0,
+        360.0,
+        180.0,
+        50.0,
+        0.0,
         0.0
       ],
-      "exp": 45000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 11,
       "QualityBonusChance": [
-        507.0,
-        300.0,
-        150.0,
-        35.0,
-        8.0,
+        369.0,
+        378.0,
+        189.0,
+        58.0,
+        6.0,
         0.0
       ],
-      "exp": 51000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 12,
       "QualityBonusChance": [
-        483.0,
-        310.0,
-        155.0,
-        40.0,
+        328.0,
+        396.0,
+        198.0,
+        66.0,
         12.0,
         0.0
       ],
-      "exp": 57000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 13,
       "QualityBonusChance": [
-        459.0,
-        320.0,
-        160.0,
-        45.0,
-        16.0,
+        287.0,
+        414.0,
+        207.0,
+        74.0,
+        18.0,
         0.0
       ],
-      "exp": 63000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 14,
       "QualityBonusChance": [
-        435.0,
-        330.0,
-        165.0,
-        50.0,
-        20.0,
+        246.0,
+        432.0,
+        216.0,
+        82.0,
+        24.0,
         0.0
       ],
-      "exp": 69000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 15,
       "QualityBonusChance": [
-        411.0,
-        340.0,
-        170.0,
-        55.0,
-        24.0,
+        205.0,
+        450.0,
+        225.0,
+        90.0,
+        30.0,
         0.0
       ],
-      "exp": 75000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 16,
       "QualityBonusChance": [
-        387.0,
-        350.0,
-        175.0,
-        60.0,
-        28.0,
+        164.0,
+        468.0,
+        234.0,
+        98.0,
+        36.0,
         0.0
       ],
-      "exp": 81000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 17,
       "QualityBonusChance": [
-        363.0,
-        360.0,
-        180.0,
-        65.0,
-        32.0,
+        123.0,
+        486.0,
+        243.0,
+        106.0,
+        42.0,
         0.0
       ],
-      "exp": 87000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 18,
       "QualityBonusChance": [
-        339.0,
-        370.0,
-        185.0,
-        70.0,
-        36.0,
+        82.0,
+        504.0,
+        252.0,
+        114.0,
+        48.0,
         0.0
       ],
-      "exp": 93000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 19,
       "QualityBonusChance": [
-        315.0,
-        380.0,
-        190.0,
-        75.0,
-        40.0,
+        41.0,
+        522.0,
+        261.0,
+        122.0,
+        54.0,
         0.0
       ],
-      "exp": 99000,
+      "exp": 2000,
       "MaxNum": 6
     },
     {
       "ID": 20,
       "QualityBonusChance": [
-        291.0,
-        390.0,
-        195.0,
-        80.0,
-        44.0,
+        0.0,
+        540.0,
+        270.0,
+        130.0,
+        60.0,
         0.0
       ],
-      "exp": 105000,
+      "exp": 1000000,
       "MaxNum": 6
     }
   ]

+ 469 - 39
Assets/Res/Config/DropConfig.json

@@ -61,93 +61,113 @@
       ]
     },
     {
-      "ID": 1201,
+      "ID": 1007,
       "dropGroupID": [
-        1201
+        1007
       ],
       "dropType": 3,
       "showItemId": [
-        1201
+        1007
       ]
     },
     {
-      "ID": 1202,
+      "ID": 1101,
       "dropGroupID": [
-        1202
+        1101
       ],
       "dropType": 3,
       "showItemId": [
-        1202
+        1101
       ]
     },
     {
-      "ID": 1203,
+      "ID": 1102,
       "dropGroupID": [
-        1203
+        1102
       ],
       "dropType": 3,
       "showItemId": [
-        1203
+        1102
       ]
     },
     {
-      "ID": 1204,
+      "ID": 1103,
       "dropGroupID": [
-        1204
+        1103
       ],
       "dropType": 3,
       "showItemId": [
-        1204
+        1103
+      ]
+    },
+    {
+      "ID": 1104,
+      "dropGroupID": [
+        1104
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1104
+      ]
+    },
+    {
+      "ID": 1105,
+      "dropGroupID": [
+        1105
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1105
       ]
     },
     {
-      "ID": 1205,
+      "ID": 1106,
       "dropGroupID": [
-        1205
+        1106
       ],
       "dropType": 3,
       "showItemId": [
-        1205
+        1106
       ]
     },
     {
-      "ID": 1206,
+      "ID": 1201,
       "dropGroupID": [
-        1206
+        1201
       ],
       "dropType": 3,
       "showItemId": [
-        1206
+        1201
       ]
     },
     {
-      "ID": 1207,
+      "ID": 1202,
       "dropGroupID": [
-        1207
+        1202
       ],
       "dropType": 3,
       "showItemId": [
-        1207
+        1202
       ]
     },
     {
-      "ID": 1208,
+      "ID": 1203,
       "dropGroupID": [
-        1208
+        1203
       ],
       "dropType": 3,
       "showItemId": [
-        1208
+        1203
       ]
     },
     {
-      "ID": 1209,
+      "ID": 1204,
       "dropGroupID": [
-        1209
+        1204
       ],
       "dropType": 3,
       "showItemId": [
-        1209
+        1204
       ]
     },
     {
@@ -190,6 +210,56 @@
         1304
       ]
     },
+    {
+      "ID": 1305,
+      "dropGroupID": [
+        1305
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1305
+      ]
+    },
+    {
+      "ID": 1306,
+      "dropGroupID": [
+        1306
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1306
+      ]
+    },
+    {
+      "ID": 1307,
+      "dropGroupID": [
+        1307
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1307
+      ]
+    },
+    {
+      "ID": 1308,
+      "dropGroupID": [
+        1308
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1308
+      ]
+    },
+    {
+      "ID": 1309,
+      "dropGroupID": [
+        1309
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1309
+      ]
+    },
     {
       "ID": 1401,
       "dropGroupID": [
@@ -260,6 +330,36 @@
         1601
       ]
     },
+    {
+      "ID": 1701,
+      "dropGroupID": [
+        1701
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1701
+      ]
+    },
+    {
+      "ID": 1702,
+      "dropGroupID": [
+        1702
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1702
+      ]
+    },
+    {
+      "ID": 1703,
+      "dropGroupID": [
+        1703
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1703
+      ]
+    },
     {
       "ID": 10001,
       "dropGroupID": [
@@ -830,6 +930,96 @@
         12510
       ]
     },
+    {
+      "ID": 12511,
+      "dropGroupID": [
+        12511
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12511
+      ]
+    },
+    {
+      "ID": 12512,
+      "dropGroupID": [
+        12512
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12512
+      ]
+    },
+    {
+      "ID": 12513,
+      "dropGroupID": [
+        12513
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12513
+      ]
+    },
+    {
+      "ID": 12514,
+      "dropGroupID": [
+        12514
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12514
+      ]
+    },
+    {
+      "ID": 12515,
+      "dropGroupID": [
+        12515
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12515
+      ]
+    },
+    {
+      "ID": 12516,
+      "dropGroupID": [
+        12516
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12516
+      ]
+    },
+    {
+      "ID": 12517,
+      "dropGroupID": [
+        12517
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12517
+      ]
+    },
+    {
+      "ID": 12518,
+      "dropGroupID": [
+        12518
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12518
+      ]
+    },
+    {
+      "ID": 12519,
+      "dropGroupID": [
+        12519
+      ],
+      "dropType": 3,
+      "showItemId": [
+        12519
+      ]
+    },
     {
       "ID": 13001,
       "dropGroupID": [
@@ -1180,6 +1370,96 @@
         13510
       ]
     },
+    {
+      "ID": 13511,
+      "dropGroupID": [
+        13511
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13511
+      ]
+    },
+    {
+      "ID": 13512,
+      "dropGroupID": [
+        13512
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13512
+      ]
+    },
+    {
+      "ID": 13513,
+      "dropGroupID": [
+        13513
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13513
+      ]
+    },
+    {
+      "ID": 13514,
+      "dropGroupID": [
+        13514
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13514
+      ]
+    },
+    {
+      "ID": 13515,
+      "dropGroupID": [
+        13515
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13515
+      ]
+    },
+    {
+      "ID": 13516,
+      "dropGroupID": [
+        13516
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13516
+      ]
+    },
+    {
+      "ID": 13517,
+      "dropGroupID": [
+        13517
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13517
+      ]
+    },
+    {
+      "ID": 13518,
+      "dropGroupID": [
+        13518
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13518
+      ]
+    },
+    {
+      "ID": 13519,
+      "dropGroupID": [
+        13519
+      ],
+      "dropType": 3,
+      "showItemId": [
+        13519
+      ]
+    },
     {
       "ID": 20001,
       "dropGroupID": [
@@ -1211,27 +1491,113 @@
       ]
     },
     {
-      "ID": 999001,
+      "ID": 20004,
       "dropGroupID": [
-        1,
-        2,
-        3
+        20004
       ],
-      "dropType": 2,
+      "dropType": 3,
       "showItemId": [
-        10001
+        20004
       ]
     },
     {
-      "ID": 999002,
+      "ID": 20005,
       "dropGroupID": [
-        4,
-        5,
-        6
+        20005
       ],
-      "dropType": 2,
+      "dropType": 3,
       "showItemId": [
-        12001
+        20005
+      ]
+    },
+    {
+      "ID": 20006,
+      "dropGroupID": [
+        20006
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20006
+      ]
+    },
+    {
+      "ID": 20007,
+      "dropGroupID": [
+        20007
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20007
+      ]
+    },
+    {
+      "ID": 20008,
+      "dropGroupID": [
+        20008
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20008
+      ]
+    },
+    {
+      "ID": 20009,
+      "dropGroupID": [
+        20009
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20009
+      ]
+    },
+    {
+      "ID": 20010,
+      "dropGroupID": [
+        20010
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20010
+      ]
+    },
+    {
+      "ID": 20011,
+      "dropGroupID": [
+        20011
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20011
+      ]
+    },
+    {
+      "ID": 20012,
+      "dropGroupID": [
+        20012
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20012
+      ]
+    },
+    {
+      "ID": 20013,
+      "dropGroupID": [
+        20013
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20013
+      ]
+    },
+    {
+      "ID": 20014,
+      "dropGroupID": [
+        20014
+      ],
+      "dropType": 3,
+      "showItemId": [
+        20014
       ]
     },
     {
@@ -1434,6 +1800,70 @@
         22007
       ]
     },
+    {
+      "ID": 23001,
+      "dropGroupID": [
+        23001
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23001
+      ]
+    },
+    {
+      "ID": 23002,
+      "dropGroupID": [
+        23002
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23002
+      ]
+    },
+    {
+      "ID": 23101,
+      "dropGroupID": [
+        23101
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23101
+      ]
+    },
+    {
+      "ID": 23102,
+      "dropGroupID": [
+        23102
+      ],
+      "dropType": 3,
+      "showItemId": [
+        23102
+      ]
+    },
+    {
+      "ID": 999001,
+      "dropGroupID": [
+        1,
+        2,
+        3
+      ],
+      "dropType": 2,
+      "showItemId": [
+        10001
+      ]
+    },
+    {
+      "ID": 999002,
+      "dropGroupID": [
+        4,
+        5,
+        6
+      ],
+      "dropType": 2,
+      "showItemId": [
+        12001
+      ]
+    },
     {
       "ID": 999003,
       "dropGroupID": [

+ 45 - 45
Assets/Res/Config/EventConfig.json

@@ -19,7 +19,7 @@
         999001
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 10,
@@ -51,7 +51,7 @@
         999002
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 10,
@@ -83,7 +83,7 @@
         1001
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -115,7 +115,7 @@
         1005
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -147,7 +147,7 @@
         1006
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -179,7 +179,7 @@
         1002
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         100
       ],
       "RefreshProbability": 30,
@@ -211,7 +211,7 @@
         1004
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         10
       ],
       "RefreshProbability": 20,
@@ -243,7 +243,7 @@
         1501
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 60,
@@ -275,7 +275,7 @@
         1601
       ],
       "PrizeNums": [
-        -1000,
+        -500,
         1
       ],
       "RefreshProbability": 40,
@@ -307,7 +307,7 @@
         999001
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 15,
@@ -339,7 +339,7 @@
         999002
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 15,
@@ -371,7 +371,7 @@
         1001
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -403,7 +403,7 @@
         1005
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -435,7 +435,7 @@
         1006
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         -5000
       ],
       "RefreshProbability": 100,
@@ -467,7 +467,7 @@
         1002
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         100
       ],
       "RefreshProbability": 35,
@@ -499,7 +499,7 @@
         1004
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         10
       ],
       "RefreshProbability": 25,
@@ -531,7 +531,7 @@
         1501
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 65,
@@ -563,7 +563,7 @@
         1601
       ],
       "PrizeNums": [
-        -1100,
+        -750,
         1
       ],
       "RefreshProbability": 45,
@@ -595,7 +595,7 @@
         999001
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 20,
@@ -627,7 +627,7 @@
         999002
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 20,
@@ -659,7 +659,7 @@
         1001
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -691,7 +691,7 @@
         1005
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -723,7 +723,7 @@
         1006
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -755,7 +755,7 @@
         1002
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         100
       ],
       "RefreshProbability": 40,
@@ -787,7 +787,7 @@
         1004
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         10
       ],
       "RefreshProbability": 30,
@@ -819,7 +819,7 @@
         1501
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 70,
@@ -851,7 +851,7 @@
         1601
       ],
       "PrizeNums": [
-        -1200,
+        -1500,
         1
       ],
       "RefreshProbability": 50,
@@ -883,7 +883,7 @@
         999001
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 25,
@@ -915,7 +915,7 @@
         999002
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 25,
@@ -947,7 +947,7 @@
         1001
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -979,7 +979,7 @@
         1005
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1011,7 +1011,7 @@
         1006
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1043,7 +1043,7 @@
         1002
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         100
       ],
       "RefreshProbability": 45,
@@ -1075,7 +1075,7 @@
         1004
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         10
       ],
       "RefreshProbability": 35,
@@ -1107,7 +1107,7 @@
         1501
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 75,
@@ -1139,7 +1139,7 @@
         1601
       ],
       "PrizeNums": [
-        -1300,
+        -3000,
         1
       ],
       "RefreshProbability": 55,
@@ -1171,7 +1171,7 @@
         999001
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 30,
@@ -1203,7 +1203,7 @@
         999002
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 30,
@@ -1235,7 +1235,7 @@
         1001
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1267,7 +1267,7 @@
         1005
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1299,7 +1299,7 @@
         1006
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1331,7 +1331,7 @@
         1002
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         100
       ],
       "RefreshProbability": 50,
@@ -1363,7 +1363,7 @@
         1004
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         10
       ],
       "RefreshProbability": 40,
@@ -1395,7 +1395,7 @@
         1501
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 80,
@@ -1427,7 +1427,7 @@
         1601
       ],
       "PrizeNums": [
-        -1400,
+        -5000,
         1
       ],
       "RefreshProbability": 60,

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

@@ -46,9 +46,9 @@
       ],
       "qiankundaiMaxTime": 43200,
       "shenshiPointRecSPD": [
-        10000.0,
-        2.0,
-        0.05
+        2000.0,
+        0.023148,
+        0.023148
       ]
     }
   ]

File diff suppressed because it is too large
+ 112 - 112
Assets/Res/Config/HeroPowerUpConfig.json


File diff suppressed because it is too large
+ 112 - 112
Assets/Res/Config/ResourceLevelConfig.json


+ 252 - 140
Assets/Res/UI/GuidePanel/GuideHand.prefab

@@ -60,7 +60,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -120,8 +120,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 559048862761468158}
+  - {fileID: 4859298660771053476}
   - {fileID: 734780392825207828}
-  - {fileID: 1687954597818881594}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -149,7 +150,7 @@ MonoBehaviour:
       - {x: 1, y: 0, z: 0, w: 0}
       UIStateStrTypes: 
       UIStateStrDatas: []
-    - Target: {fileID: 1687954597818881593}
+    - Target: {fileID: 0}
       UIStateV4Types: 04000000
       UIStateV4Datas:
       - {x: 1, y: 0, z: 0, w: 0}
@@ -162,7 +163,7 @@ MonoBehaviour:
       - {x: 1, y: 0, z: 0, w: 0}
       UIStateStrTypes: 
       UIStateStrDatas: []
-    - Target: {fileID: 1687954597818881593}
+    - Target: {fileID: 0}
       UIStateV4Types: 04000000
       UIStateV4Datas:
       - {x: 0, y: 0, z: 0, w: 0}
@@ -175,7 +176,7 @@ MonoBehaviour:
       - {x: 0, y: 0, z: 0, w: 0}
       UIStateStrTypes: 
       UIStateStrDatas: []
-    - Target: {fileID: 1687954597818881593}
+    - Target: {fileID: 0}
       UIStateV4Types: 04000000
       UIStateV4Datas:
       - {x: 1, y: 0, z: 0, w: 0}
@@ -183,7 +184,7 @@ MonoBehaviour:
       UIStateStrDatas: []
   AllComs:
   - {fileID: 734780392825207831}
-  - {fileID: 1687954597818881593}
+  - {fileID: 0}
   AllComsStateTypes: 0400000004000000
   CurrIndex: 0
 --- !u!95 &6928099528430643331
@@ -207,142 +208,253 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1001 &8032866909881840609
-PrefabInstance:
+--- !u!1 &5287169494778414569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 559048862761468158}
+  - component: {fileID: 4284619971589467747}
+  - component: {fileID: 6514837214852521581}
+  - component: {fileID: 217192112549898342}
+  - component: {fileID: 5493032757195695916}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: obyindaoglow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &559048862761468158
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 707.505, y: 707.505, z: 707.505}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 734780393184598389}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -0.00010325}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!33 &4284619971589467747
+MeshFilter:
   m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 734780393184598389}
-    m_Modifications:
-    - target: {fileID: 6771112416032687343, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6771112416032687343, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_SortingLayer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288616813134132, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288616813134132, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_SortingLayer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_Name
-      value: fx_ui_yindao
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
---- !u!1 &1687954597818881593 stripped
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6514837214852521581
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 271326802a434724d97bfc8a823eea5e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!222 &217192112549898342
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_CullTransparentMesh: 1
+--- !u!114 &5493032757195695916
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5287169494778414569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f5e1d33d8c6440147a652242da460aa0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  _material: {fileID: 2100000, guid: 271326802a434724d97bfc8a823eea5e, type: 2}
+  _Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+  isNewMaterial: 0
+  Camera: {fileID: 0}
+--- !u!1 &7448694573110418986
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-  m_PrefabInstance: {fileID: 8032866909881840609}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &1687954597818881594 stripped
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4859298660771053476}
+  - component: {fileID: 8875242389735633327}
+  - component: {fileID: 1255425239809916940}
+  - component: {fileID: 497913008934607685}
+  - component: {fileID: 3089208175986317632}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: obyindaoquan
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4859298660771053476
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-  m_PrefabInstance: {fileID: 8032866909881840609}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 150, y: 150, z: 150}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 734780393184598389}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!33 &8875242389735633327
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_Mesh: {fileID: 7450741763379908841, guid: 76d2ca31c31fede4db041d5a0a2d9b7b, type: 3}
+--- !u!23 &1255425239809916940
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: ec90ffb33e78936458f3ef4b5a77becf, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!222 &497913008934607685
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_CullTransparentMesh: 1
+--- !u!114 &3089208175986317632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7448694573110418986}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f5e1d33d8c6440147a652242da460aa0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  _material: {fileID: 2100000, guid: ec90ffb33e78936458f3ef4b5a77becf, type: 2}
+  _Mesh: {fileID: 7450741763379908841, guid: 76d2ca31c31fede4db041d5a0a2d9b7b, type: 3}
+  isNewMaterial: 0
+  Camera: {fileID: 0}

+ 51 - 276
Assets/Res/UI/GuidePanel/GuidePanel.prefab

@@ -903,213 +903,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &2578906857760758322
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2578906857760758321}
-  - component: {fileID: 2578906857760758327}
-  - component: {fileID: 3288445138209271218}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2578906857760758321
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2578906857760758322}
-  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: []
-  m_Father: {fileID: 2578906858074029904}
-  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: 63.8, y: -68.4}
-  m_SizeDelta: {x: 138, y: 149}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2578906857760758327
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2578906857760758322}
-  m_CullTransparentMesh: 1
---- !u!114 &3288445138209271218
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2578906857760758322}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_yd_shou
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: c69b566b4ee58f61c7c30d14c3b8f8ab
-  imageH: 256
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0
---- !u!1 &2578906858074029905
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2578906858074029904}
-  - component: {fileID: 8052714225314986784}
-  - component: {fileID: 5322662195048894118}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: GuideHand
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &2578906858074029904
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2578906858074029905}
-  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: 2578906857760758321}
-  - {fileID: 4509432550046429215}
-  m_Father: {fileID: 6330229592131453682}
-  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: 663, y: 15}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &8052714225314986784
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2578906858074029905}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - StateInfos:
-    - Target: {fileID: 2578906857760758322}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 1, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-    - Target: {fileID: 4509432550046429212}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 1, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-  - StateInfos:
-    - Target: {fileID: 2578906857760758322}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 1, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-    - Target: {fileID: 4509432550046429212}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 0, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-  - StateInfos:
-    - Target: {fileID: 2578906857760758322}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 0, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-    - Target: {fileID: 4509432550046429212}
-      UIStateV4Types: 04000000
-      UIStateV4Datas:
-      - {x: 1, y: 0, z: 0, w: 0}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-  AllComs:
-  - {fileID: 2578906857760758322}
-  - {fileID: 4509432550046429212}
-  AllComsStateTypes: 0400000004000000
-  CurrIndex: 0
---- !u!95 &5322662195048894118
-Animator:
-  serializedVersion: 5
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2578906858074029905}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f2a7efcd63199ab4795e66e996544127, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &3030673193679400742
 GameObject:
   m_ObjectHideFlags: 0
@@ -2524,7 +2317,7 @@ RectTransform:
   - {fileID: 7439561601982882811}
   - {fileID: 6330229591859497050}
   - {fileID: 5518757894177767966}
-  - {fileID: 2578906858074029904}
+  - {fileID: 8223377380414650460}
   - {fileID: 5563397094415776362}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2597,7 +2390,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: GuideHand
-    gameObject: {fileID: 2578906858074029904}
+    gameObject: {fileID: 8223377380414650460}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -2607,7 +2400,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: GuideHandState
-    gameObject: {fileID: 8052714225314986784}
+    gameObject: {fileID: 4473671865493666860}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -3184,142 +2977,124 @@ MonoBehaviour:
   - {fileID: 364822825935141282}
   AllComsStateTypes: 04000000040000000400000004000000
   CurrIndex: 0
---- !u!1001 &5080642181591307716
+--- !u!1001 &8659640294664855849
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 2578906858074029904}
+    m_TransformParent: {fileID: 6330229592131453682}
     m_Modifications:
-    - target: {fileID: 6771112416032687343, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6771112416032687343, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_SortingLayer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288616813134132, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288616813134132, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_SortingLayer
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598388, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Name
-      value: fx_ui_yindao
+      value: GuideHand
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598388, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_AnchorMin.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_AnchorMin.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
+      value: 100
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 1281
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 165
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
+    - target: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6928099528430643331, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
---- !u!1 &4509432550046429212 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8653288617156044248, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-  m_PrefabInstance: {fileID: 5080642181591307716}
+  m_SourcePrefab: {fileID: 100100000, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+--- !u!114 &4473671865493666860 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5059957099899968773, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+  m_PrefabInstance: {fileID: 8659640294664855849}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &4509432550046429215 stripped
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &8223377380414650460 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8653288617156044251, guid: edd8857720faf1b46b8facc4034b24c3, type: 3}
-  m_PrefabInstance: {fileID: 5080642181591307716}
+  m_CorrespondingSourceObject: {fileID: 734780393184598389, guid: c49f0291e3d46584db5de0cfca5970e2, type: 3}
+  m_PrefabInstance: {fileID: 8659640294664855849}
   m_PrefabAsset: {fileID: 0}

+ 492 - 1
Assets/Res/UI/GuidePanel/loop.anim

@@ -50,7 +50,165 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: Image
-  m_FloatCurves: []
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: {x: 100, y: 100, z: 100}
+        inSlope: {x: 617.0314, y: 642.7426, z: 616.7219}
+        outSlope: {x: 617.0314, y: 642.7426, z: 616.7219}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.07149983, y: 0.06775966, z: 0.073369935}
+      - serializedVersion: 3
+        time: 1
+        value: {x: 320, y: 320, z: 320}
+        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: obyindaoquan
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 707.505, y: 707.505, z: 707.505}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.7
+        value: {x: 938.85913, y: 938.85913, z: 938.85913}
+        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: obyindaoglow
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.56666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoquan
+    classID: 23
+    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.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoglow
+    classID: 23
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.00010325
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: -0.00012906
+        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_AnchoredPosition.y
+    path: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -68,6 +226,51 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3861913253
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2052918103
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 3861913253
+      attribute: 2333735666
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2052918103
+      attribute: 2333735666
+      script: {fileID: 0}
+      typeID: 23
+      customType: 22
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 2052918103
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -207,6 +410,294 @@ AnimationClip:
     classID: 224
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 100
+        inSlope: 617.0314
+        outSlope: 617.0314
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.07149983
+      - serializedVersion: 3
+        time: 1
+        value: 320
+        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: obyindaoquan
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 100
+        inSlope: 642.7426
+        outSlope: 642.7426
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.06775966
+      - serializedVersion: 3
+        time: 1
+        value: 320
+        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: obyindaoquan
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 100
+        inSlope: 616.7219
+        outSlope: 616.7219
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.073369935
+      - serializedVersion: 3
+        time: 1
+        value: 320
+        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: obyindaoquan
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.13333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.56666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoquan
+    classID: 23
+    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.25
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: material._Alpha
+    path: obyindaoglow
+    classID: 23
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: 707.505
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 938.85913
+        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: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: 707.505
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 938.85913
+        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: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.25
+        value: 707.505
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: 938.85913
+        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: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.00010325
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.7
+        value: -0.00012906
+        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_AnchoredPosition.y
+    path: obyindaoglow
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

BIN
Assets/Res/UI/LevelChoosePanel/8222cd423e0f95a409ab3a21db7f52eb.png


+ 203 - 0
Assets/Res/UI/LevelChoosePanel/8222cd423e0f95a409ab3a21db7f52eb.png.meta

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

+ 657 - 100
Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_AnchoredPosition: {x: -0.000015258789, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9173684396724230179
@@ -133,8 +133,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -11.5489, y: -344.4}
-  m_SizeDelta: {x: 451.1251, y: 34.2721}
+  m_AnchoredPosition: {x: -41.7, y: -384.1}
+  m_SizeDelta: {x: 451.1251, y: 45.875}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7336380052441854382
 CanvasRenderer:
@@ -157,7 +157,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.73333335, g: 0.73333335, b: 0.7019608, a: 0.85882354}
+  m_Color: {r: 0.6156863, g: 0.6862745, b: 0.6431373, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -223,8 +223,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -93.8}
-  m_SizeDelta: {x: 298.803, y: 54.7022}
+  m_AnchoredPosition: {x: -20, y: -49.4}
+  m_SizeDelta: {x: 298.803, y: 106.2965}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &700079147170673296
 CanvasRenderer:
@@ -256,11 +256,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 44
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
-    m_MaxSize: 52
+    m_MaxSize: 300
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -319,7 +319,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 5, y: -8.4}
+  m_AnchoredPosition: {x: -5.200012, y: -14.399994}
   m_SizeDelta: {x: 163, y: 44}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &3548920735970161296
@@ -408,7 +408,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000015258789, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7274836141279032238
@@ -442,7 +442,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 18
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -491,8 +491,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.8001003, y: 52.9}
-  m_SizeDelta: {x: 492.68, y: 33.1795}
+  m_AnchoredPosition: {x: 5.5839, y: 94.19008}
+  m_SizeDelta: {x: 531.6478, y: 36.3993}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5233347206102238726
 MonoBehaviour:
@@ -541,7 +541,7 @@ MonoBehaviour:
   m_MinValue: 0
   m_MaxValue: 1
   m_WholeNumbers: 0
-  m_Value: 0.354
+  m_Value: 1
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -565,6 +565,95 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!1 &3056255915321412976
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3405981342033330950}
+  - component: {fileID: 6419126460201600798}
+  - component: {fileID: 6928674705232068254}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3405981342033330950
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3056255915321412976}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6578784403621460593}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 29.2, y: 1.5}
+  m_SizeDelta: {x: 25, y: 26}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6419126460201600798
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3056255915321412976}
+  m_CullTransparentMesh: 1
+--- !u!114 &6928674705232068254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3056255915321412976}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.854902, g: 0.8588236, b: 0.86666673, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_map_icon2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 7ceaf8c112ed81700d38e023cdd01c47
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3928254918750203810
 GameObject:
   m_ObjectHideFlags: 0
@@ -849,7 +938,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.3, y: 111.24746}
+  m_AnchoredPosition: {x: -0.000012159, y: 159.7}
   m_SizeDelta: {x: 493.6785, y: 74.059}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1408737160681650111
@@ -955,7 +1044,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000015258789, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8858969093048269334
@@ -1009,6 +1098,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &5155747675084282624
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5091619205551799956}
+  - component: {fileID: 9150589898022879235}
+  - component: {fileID: 5389723256030474093}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Fill (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5091619205551799956
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5155747675084282624}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7389830302287868273}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 63.5, y: 0}
+  m_SizeDelta: {x: 182, y: 182}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &9150589898022879235
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5155747675084282624}
+  m_CullTransparentMesh: 1
+--- !u!114 &5389723256030474093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5155747675084282624}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.47058827, g: 0.654902, b: 0.8235295, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_glow
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 20.902199
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5188785653245930354
 GameObject:
   m_ObjectHideFlags: 0
@@ -1068,7 +1246,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.45098042, g: 0.43921572, b: 0.38823533, a: 1}
+  m_Color: {r: 0.30588236, g: 0.26666668, b: 0.227451, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1146,7 +1324,7 @@ MonoBehaviour:
     m_Top: 1
     m_Bottom: 0
   m_ChildAlignment: 4
-  m_Spacing: 4.17
+  m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -1223,7 +1401,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 748, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1359551343155104095
 CanvasRenderer:
@@ -1246,14 +1424,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.6901961}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2ce0740c14f50c442b22a6e578a7726d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8a39f9817e4bb6048a00dd9dd1f76544, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1338,6 +1516,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3838201398444664671}
   - {fileID: 5996218483595023549}
   - {fileID: 3448986095428033778}
   - {fileID: 116889275732161449}
@@ -1347,13 +1526,12 @@ RectTransform:
   - {fileID: 7892632760807934045}
   - {fileID: 5693100649297059383}
   - {fileID: 6705522348014208234}
-  - {fileID: 6012375192494328535}
   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: 534.6832, y: 750.1214}
+  m_AnchoredPosition: {x: -3.6557, y: 63.386597}
+  m_SizeDelta: {x: 605.781, y: 859.2291}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6624760465754027965
 CanvasRenderer:
@@ -1376,7 +1554,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
+  m_Color: {r: 0.30588236, g: 0.42352945, b: 0.37254903, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1393,7 +1571,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1406,6 +1584,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6774701749572014135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1857008029141030025}
+  - component: {fileID: 5411936683948853825}
+  - component: {fileID: 4291107290588238652}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Tongyong (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1857008029141030025
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774701749572014135}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3590038822651024970}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
+  m_SizeDelta: {x: 22, y: 20}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &5411936683948853825
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774701749572014135}
+  m_CullTransparentMesh: 1
+--- !u!114 &4291107290588238652
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6774701749572014135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7725491, g: 0.7411765, b: 0.6745098, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_map_suo
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 79efd91d4f98d1967eff87055daf4492
+  imageH: 53.2287
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7182261811213703053
 GameObject:
   m_ObjectHideFlags: 0
@@ -1441,7 +1708,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 267.3, y: -396.3}
+  m_AnchoredPosition: {x: 247.4, y: -459.5}
   m_SizeDelta: {x: 428.11, y: 220.5094}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6166222951810868570
@@ -1465,7 +1732,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.58431375, g: 0.58431375, b: 0.5764706, a: 1}
+  m_Color: {r: 0.34509805, g: 0.30980393, b: 0.26666668, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1474,7 +1741,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -1521,8 +1788,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 14.600006, y: 0}
+  m_SizeDelta: {x: -29.2, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5325227394525925118
 CanvasRenderer:
@@ -1545,7 +1812,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7019608, g: 0.654902, b: 0.5882353, a: 1}
+  m_Color: {r: 0.85098046, g: 0.854902, b: 0.86274517, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1554,18 +1821,18 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 32
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 41
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7B2C\u4E00\u7AE0.\u900D\u9065\u6E38"
+  m_Text: "\u5317\u6D77"
 --- !u!1 &7693130723521537062
 GameObject:
   m_ObjectHideFlags: 0
@@ -1600,9 +1867,98 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.43051147, y: 0.61389923}
+  m_SizeDelta: {x: -7.307, y: -4.6042}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7911065620788399886
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3838201398444664671}
+  - component: {fileID: 3556593206140447287}
+  - component: {fileID: 8322207378195391467}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3838201398444664671
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7911065620788399886}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4534880848114758260}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -21.075012, y: -19.227417}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3556593206140447287
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7911065620788399886}
+  m_CullTransparentMesh: 1
+--- !u!114 &8322207378195391467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7911065620788399886}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 7ceaf8c112ed81700d38e023cdd01c47
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8125396639363880815
 GameObject:
   m_ObjectHideFlags: 0
@@ -1641,8 +1997,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 2.3566, y: 56.176025}
-  m_SizeDelta: {x: 252.4655, y: 65.1254}
+  m_AnchoredPosition: {x: -0.6037, y: 83.04645}
+  m_SizeDelta: {x: 274.7817, y: 79.2438}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7414710902306389851
 CanvasRenderer:
@@ -1682,7 +2038,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_yuanjiao16
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1763,6 +2119,7 @@ GameObject:
   - component: {fileID: 7389830302287868273}
   - component: {fileID: 7908578725401352913}
   - component: {fileID: 890217472061856336}
+  - component: {fileID: 8847888511754474620}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Fill
@@ -1782,7 +2139,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 5091619205551799956}
   m_Father: {fileID: 6795561961694487067}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1811,7 +2169,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.68235296, g: 0.8078432, b: 0.8000001, a: 1}
+  m_Color: {r: 0.41176474, g: 0.5294118, b: 0.6313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1841,6 +2199,19 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8847888511754474620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8551123114888839117}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
 --- !u!1 &8572950913021192746
 GameObject:
   m_ObjectHideFlags: 0
@@ -1900,7 +2271,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.41960788, g: 0.40784317, b: 0.3529412, a: 1}
+  m_Color: {r: 0.3019608, g: 0.2627451, b: 0.22352943, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1989,7 +2360,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
+    m_FontSize: 18
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
@@ -2035,6 +2406,7 @@ RectTransform:
   - {fileID: 1390114855689535063}
   - {fileID: 5584341330677092523}
   - {fileID: 4534880848114758260}
+  - {fileID: 3590038822651024970}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2096,7 +2468,7 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   - key: ShopBtnWidgetGame
-    gameObject: {fileID: 121537455608265632}
+    gameObject: {fileID: 8599672486795074892}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -2148,12 +2520,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3904336313667662518}
+  - {fileID: 3405981342033330950}
   m_Father: {fileID: 4534880848114758260}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -174.8}
-  m_SizeDelta: {x: 404, y: 34}
+  m_AnchoredPosition: {x: 7.9892, y: -159.34589}
+  m_SizeDelta: {x: 168.9374, y: 46.5201}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1326854359071030663
 CanvasRenderer:
@@ -2176,7 +2549,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21960786, g: 0.27450982, b: 0.28235295, a: 1}
+  m_Color: {r: 0.42352945, g: 0.5529412, b: 0.5176471, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2193,7 +2566,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_jianbiandi1
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -2241,8 +2614,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 535, y: 276}
+  m_AnchoredPosition: {x: -1.3, y: -9.6137}
+  m_SizeDelta: {x: 582.93, y: 300.7258}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &4246003462805992071
 CanvasRenderer:
@@ -2295,118 +2668,302 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1001 &940294652879713634
+--- !u!1001 &4506222564502478261
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 4534880848114758260}
+    m_TransformParent: {fileID: 9037135992368401232}
     m_Modifications:
-    - target: {fileID: 910660254783983298, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-      propertyPath: m_Name
-      value: ShopBtnWidgetGame
-      objectReference: {fileID: 0}
-    - target: {fileID: 910660254783983298, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1463050438306358852, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-      propertyPath: m_FontData.m_FontSize
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_Pivot.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_Pivot.y
-      value: 1
+      value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMax.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchorMin.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 98.7123
+      value: 160.5204
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 58.3894
+      value: 53.7076
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20.202423
+      value: 211.32388
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -227.78363
+      value: -589.4135
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
+    - target: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: CurrIndex
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComs.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComs.Array.data[1]
+      value: 
+      objectReference: {fileID: 6774701749572014135}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComsStateTypes.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: AllComsStateTypes.Array.data[1]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].Target
+      value: 
+      objectReference: {fileID: 6774701749572014135}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].Target
+      value: 
+      objectReference: {fileID: 6774701749572014135}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Datas.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Types.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Types.Array.data[0]
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].x
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].y
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].z
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[0].StateInfos.Array.data[1].UIStateV4Datas.Array.data[0].x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].x
+      value: 0.9058824
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].y
+      value: 0.86666673
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[0].UIStateV4Datas.Array.data[0].z
+      value: 0.7725491
+      objectReference: {fileID: 0}
+    - target: {fileID: 2223338153548070713, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: data.Array.data[1].StateInfos.Array.data[1].UIStateV4Datas.Array.data[0].x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -1.7727966
+      objectReference: {fileID: 0}
+    - target: {fileID: 3632580815140561196, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -3.1649017
+      objectReference: {fileID: 0}
+    - target: {fileID: 4360649484400356509, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Text
+      value: "\u6982\u7387"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Name
+      value: Btn_GaiLvGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: isScriptControl
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8836760789256366128, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Color.b
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 8836760789256366128, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Color.g
+      value: 0.74509805
+      objectReference: {fileID: 0}
+    - target: {fileID: 8836760789256366128, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      propertyPath: m_Color.r
+      value: 0.74509805
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
---- !u!1 &121537455608265632 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 910660254783983298, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-  m_PrefabInstance: {fileID: 940294652879713634}
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 1857008029141030025}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5795172039040046989}
+  m_SourcePrefab: {fileID: 100100000, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+--- !u!114 &147899801984921896 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4360649484400356509, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &6012375192494328535 stripped
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &3590038822651024970 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6808499670976233397, guid: d70bc07ad46cebb4ab45136fcd482e9f, type: 3}
-  m_PrefabInstance: {fileID: 940294652879713634}
+  m_CorrespondingSourceObject: {fileID: 1106531760243264511, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8158165431304432478 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5746295913924572907, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8599672486795074892}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &8599672486795074892 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5319170196061798649, guid: 915dbd9931a60104c99a84db24a1e9d9, type: 3}
+  m_PrefabInstance: {fileID: 4506222564502478261}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5795172039040046989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8599672486795074892}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 147899801984921896}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: uiToggle
+    gameObject: {fileID: 8158165431304432478}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1

+ 5 - 0
Assets/Scripts/GameData/ExcelConfig/DivineSenseConfig.cs

@@ -54,6 +54,11 @@ namespace Excel2Json
 #endif
 		
 
+
+
+
+
+
 	}
 
 }

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

+ 2 - 2
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -62,7 +62,7 @@ namespace Fort23.Mono
             }
 
 
-            toggleList.GetChildObj();
+            // toggleList.GetChildObj();
             _shopBtnWidgets[0].OnPointerClick();
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
@@ -134,7 +134,7 @@ namespace Fort23.Mono
                 Text_Go.text = "前往";
             }
 
-            toggleList.ClickWidget(shopBtnWidget.uiToggle);
+            // toggleList.ClickWidget(shopBtnWidget.uiToggle);
 
             smallPlacesConfig = shopBtnWidget.SmallPlacesConfig;
             AccountFileInfo.SmallPlacesData smallPlacesData =

+ 40 - 1
Assets/Scripts/GameUI/UI/ShopPanel/ShopBtnWidget.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
@@ -33,11 +34,49 @@ namespace Fort23.Mono
             this.ShopGroupConfig = shopGroupConfig;
             Text_Name.text = LanguageManager.Instance.Text(ShopGroupConfig.shopName);
         }
-        
+
         public void CustomInit(int smallPlacesId)
         {
             this.SmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesId);
             Text_Name.text = LanguageManager.Instance.Text(SmallPlacesConfig.placeName);
+
+            PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID - 1);
+            AccountFileInfo.SmallPlacesData lastSmallPlacesData =
+                PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID - 1);
+            SmallPlacesConfig lastSmallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(SmallPlacesConfig.ID - 1);
+            if (SmallPlacesConfig.ID > 1 && (lastSmallPlacesData == null ||
+                                             lastSmallPlacesData.completionEventCount <
+                                             lastSmallPlacesConfig.CompletionEventCount))
+            {
+                uiToggle.Hind();
+                // TipMessagePanel.OpenTipMessagePanel(
+                //     $"[{LanguageManager.Instance.Text(shopBtnWidget.SmallPlacesConfig.placeName)}]未解锁, 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁. ");
+
+                return;
+            }
+
+            if (lastSmallPlacesConfig.UnlockEnvetid != 0)
+            {
+                AccountFileInfo.EventList eventList =
+                    AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce =>
+                        ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
+                if (eventList == null || !eventList.isCompleted)
+                {
+                    uiToggle.Hind();
+                    return;
+                }
+            }
+
+            AccountFileInfo.SmallPlacesData currentSmallPlacesData =
+                PlayerManager.Instance.GetSmallPlacesData(SmallPlacesConfig.ID);
+            if (currentSmallPlacesData == null)
+            {
+                uiToggle.Hind();
+                return;
+            }
+
+            uiToggle.Show();
         }
     }
 }

BIN
Excel2Json/Excel/ChouKa.xlsx


BIN
Excel2Json/Excel/DivineSenseConfig.xlsx


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/GameConstant.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/ResourceLevel.xlsx


BIN
Excel2Json/Excel/修仙游戏数据规划表.xlsx


+ 10 - 10
UserSettings/EditorUserSettings.asset

@@ -21,34 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 0101040051055e02550d5c2148220844454f1e2e74707e622f2b1f37e7b06560
+      value: 5b5351570100080a095d5f7a40700a44424f1a2b782a7f327b7a4432e6e5606b
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5b5351570100080a095d5f7a40700a44424f1a2b782a7f327b7a4432e6e5606b
+      value: 5402055e50575f5d0f5e54711173084444154f7e2f7a24657e2b1837b7b56669
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5402055e50575f5d0f5e54711173084444154f7e2f7a24657e2b1837b7b56669
+      value: 0050025706050c5d5f0c58274673074417161b72782977637e7b4c6bb1e6606e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 0050025706050c5d5f0c58274673074417161b72782977637e7b4c6bb1e6606e
+      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
+      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
+      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
+      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 0150565056040b095b0a0d7143725944101648287f2a72352b7e1967e7e2356e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

Some files were not shown because too many files changed in this diff