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

Assets/Art/VFX/FXPrefabs/fx gw 9091 zd.prefab

@@ -19574,10 +19574,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 10
+  speed: 12
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0

Assets/Art/VFX/FXPrefabs/fx gw zhizhu 9032zd.prefab

@@ -6724,7 +6724,7 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 20
+  speed: 15
   roatRoot: {fileID: 0}
   raotIndex: 0
   parabolaCurveType: 1

Assets/Art/VFX/FXPrefabs/fx gw zhizhu 9033zd.prefab

@@ -19705,7 +19705,7 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 25
+  speed: 17
   roatRoot: {fileID: 0}
   raotIndex: 0
   parabolaCurveType: 1

Assets/Art/VFX/FXPrefabs/fx gw zhizhu zd.prefab

@@ -19571,7 +19571,7 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 25
+  speed: 15
   roatRoot: {fileID: 0}
   raotIndex: 0
   parabolaCurveType: 1

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

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

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

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

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -262,6 +262,7 @@ GameObject:
   - component: {fileID: 4251176618484867663}
   - component: {fileID: 7108258747564116440}
   - component: {fileID: 9137017659689659031}
+  - component: {fileID: 7933938423984907002}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -341,6 +342,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &7933938423984907002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1814268402840942092}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1947865541254548843
 GameObject:
   m_ObjectHideFlags: 0
@@ -778,7 +794,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: 1125, y: 2436}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7203008914783957009
 CanvasRenderer:

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -441,7 +441,6 @@ RectTransform:
   - {fileID: 2896655462721008753}
   - {fileID: 2569128129379278262}
   - {fileID: 1800286556967781995}
-  - {fileID: 9037408276187403176}
   - {fileID: 9015813682729671128}
   - {fileID: 8060720440738292912}
   - {fileID: 3450703639607992522}
@@ -454,12 +453,13 @@ RectTransform:
   - {fileID: 1239183305622828816}
   - {fileID: 930257813965420181}
   - {fileID: 7414451559422028567}
+  - {fileID: 9037408276187403176}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1500, y: 3248}
+  m_SizeDelta: {x: 384, y: 835}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7897761964867798499
 MonoBehaviour:
@@ -684,6 +684,7 @@ GameObject:
   - component: {fileID: 5258984480970263254}
   - component: {fileID: 2346187674936933079}
   - component: {fileID: 1013011384258992587}
+  - component: {fileID: 2633697768577067462}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_Log
@@ -820,6 +821,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &2633697768577067462
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1737360981415971026}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &2132268725135064903
 GameObject:
   m_ObjectHideFlags: 0
@@ -1196,9 +1212,10 @@ GameObject:
   - component: {fileID: 3637005864510300227}
   - component: {fileID: 5727746862753107768}
   - component: {fileID: 7009910568533120546}
+  - component: {fileID: 3054755758390033935}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy)
+  m_Name: Text_Title
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1211,7 +1228,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3651587731235081858}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1278,6 +1295,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10151
+--- !u!114 &3054755758390033935
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3651587731235081858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &4063004393881817651
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroAttributeWidgetType1.prefab

@@ -35,8 +35,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 197.5, y: 4.1302}
-  m_SizeDelta: {x: 77.3688, y: 45.596}
+  m_AnchoredPosition: {x: 146.96573, y: 4.1302}
+  m_SizeDelta: {x: 119.7439, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &269696468499163318
 CanvasRenderer:
@@ -73,7 +73,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Res/UI/LevelChoosePanel/主界面-小地点1.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: W3JMvX+rBngPqOEjBg628cKoAf+HIeUJrOE8kCvzQqLlPw4a4IDu7YqLxfDM
-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: "\u4E3B\u754C\u9762-\u5C0F\u5730\u70B91"
-  assetBundleVariant: 

Assets/Res/UI/LevelChoosePanel/主界面-小地点2.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: C39NsniuWnIAGu0IuJB+zNNQCHN/uyT2IclA432swhhFY4CNhJmE/DeHjGlB
-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: "\u4E3B\u754C\u9762-\u5C0F\u5730\u70B92"
-  assetBundleVariant: 

Assets/Res/UI/LevelChoosePanel/主界面-章节小背景.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: CHtM5i+lWn5ycNLKuk8C9K998JkXH97JzY7cUB2banGwIs9eQXpKcbtEHAKI
-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: "\u4E3B\u754C\u9762-\u7AE0\u8282\u5C0F\u80CC\u666F"
-  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -36,7 +36,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: 193.3148, y: -21.61725}
+  m_AnchoredPosition: {x: 229.68845, y: -21.61725}
   m_SizeDelta: {x: 100, y: 43.2345}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2840349042557368767
@@ -495,7 +495,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: 193.3148, y: -53.10725}
+  m_AnchoredPosition: {x: 229.68845, y: -53.10725}
   m_SizeDelta: {x: 61, y: 19.7455}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1665665082766802650
@@ -2377,8 +2377,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: 118.3, y: 0.000015259}
-  m_SizeDelta: {x: 386.6296, y: 67.98}
+  m_AnchoredPosition: {x: 115.585556, y: 0.000015259}
+  m_SizeDelta: {x: 459.3769, y: 67.98}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390928313110045558
 CanvasRenderer:
@@ -5411,11 +5411,11 @@ PrefabInstance:
       objectReference: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_FontData.m_MinSize
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_FontData.m_FontSize
-      value: 20
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 5709030067082120474, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_FontData.m_FontStyle
@@ -5447,7 +5447,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 66.386
+      value: 49.7743
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y
@@ -5495,11 +5495,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 493.3019
+      value: 510
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -1087.4612
+      value: -1102.7
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -5523,11 +5523,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 33.386
+      value: 25.7743
       objectReference: {fileID: 0}
     - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 33.386
+      value: 25.7743
       objectReference: {fileID: 0}
     - target: {fileID: 7091371511447556559, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -5547,7 +5547,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 33
+      value: 24
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_SizeDelta.y
@@ -5555,7 +5555,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 49.886
+      value: 37.7743
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -1053,6 +1053,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1798015912972164048}
   - component: {fileID: 5298345569981142061}
+  - component: {fileID: 7484319669545627100}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: PlayerInfo
@@ -1076,10 +1077,10 @@ RectTransform:
   - {fileID: 7383390820428798537}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 63.271}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -220, y: 0}
+  m_SizeDelta: {x: 440, y: 63.271}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5298345569981142061
 CanvasRenderer:
@@ -1089,6 +1090,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1760937640502948944}
   m_CullTransparentMesh: 1
+--- !u!114 &7484319669545627100
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1760937640502948944}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 1
 --- !u!1 &1843990269898586624
 GameObject:
   m_ObjectHideFlags: 0
@@ -1324,6 +1340,7 @@ GameObject:
   - component: {fileID: 6261009774886538096}
   - component: {fileID: 3656203349713481960}
   - component: {fileID: 4472099066628972237}
+  - component: {fileID: 6709258874224180911}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn1_Map
@@ -1460,6 +1477,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &6709258874224180911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1956023067385650890}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &2067316311261386271
 GameObject:
   m_ObjectHideFlags: 0
@@ -5088,6 +5120,7 @@ GameObject:
   - component: {fileID: 8753960067471709537}
   - component: {fileID: 8766683629811078357}
   - component: {fileID: 7489813112688999977}
+  - component: {fileID: 3102808955735513020}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Btn_Daoyou
@@ -5224,6 +5257,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   audioName: ui_button
+--- !u!114 &3102808955735513020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8816327462997807595}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &8986363544919513421
 GameObject:
   m_ObjectHideFlags: 0
@@ -5345,7 +5393,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: 550, y: 1193}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2311,7 +2311,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: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/SentimentPanel/SentimentPanel.prefab

@@ -356,6 +356,7 @@ GameObject:
   - component: {fileID: 8433458334176511681}
   - component: {fileID: 4170656597210444513}
   - component: {fileID: 4909662600279504468}
+  - component: {fileID: 8077185464686204676}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (1)
@@ -435,6 +436,21 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &8077185464686204676
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5380674767276986663}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &5692448650326671997
 GameObject:
   m_ObjectHideFlags: 0
@@ -749,7 +765,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 628, y: 1360}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Scripts/Core/UI/UTool/UIAdapter/UIAdapterForSafeArea.cs

@@ -70,6 +70,22 @@ namespace Utility.UIAdapter
                     }
                 }
             }
+            else  if (anchorPointType == AnchorPointType.Down)
+            {
+                if (safeArea.yMin > 0)
+                {
+                    if (offsetX > 0)
+                    {
+                        myRectTransform.anchoredPosition =
+                            new Vector2(anchoredPosition.x , anchoredPosition.y+ offsetX);
+                    }
+                    else
+                    {
+                        myRectTransform.anchoredPosition =
+                            new Vector2(anchoredPosition.x , anchoredPosition.y+ safeArea.yMin * ratio);
+                    }
+                }
+            }
             else if (anchorPointType == AnchorPointType.Left)
             {
                 if (safeArea.xMin > 0)

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -62,6 +62,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void RemoveDieHero(CombatHeroEntity combatHeroEntity)
         {
+            // return;
             heroDie.Remove(combatHeroEntity);
             if (!heroDispose.Contains(combatHeroEntity))
             {

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCollisionInfo.cs

@@ -42,6 +42,7 @@ namespace GameLogic.Combat.CombatTool
 
         public void Init(CombatMagicWeaponEntity a, CombatMagicWeaponEntity b, int id)
         {
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDie, HeroDie);
             _isDispose = false;
             this.id = id;
             if (a.IsEnemy)
@@ -56,6 +57,28 @@ namespace GameLogic.Combat.CombatTool
             State = 0;
         }
 
+        private void HeroDie(IEventData iEventData)
+        {
+            HeroDieEventData heroDieEventData = iEventData as HeroDieEventData;
+            CombatMagicWeaponEntity combatMagicWeaponEntity =
+                heroDieEventData.combatHeroEntity as CombatMagicWeaponEntity;
+            if (combatMagicWeaponEntity != null)
+            {
+                return;
+            }
+
+            if (a.RootMagicWeaponControl.combatHeroEntity == heroDieEventData.combatHeroEntity)
+            {
+                a.HpBl = 0;
+                CombatController.currActiveCombat.MagicWeaponCombatSence.RemoveCollisionMagicWeapon(a.MagicWeaponCollisionId);
+            }
+            else if (b.RootMagicWeaponControl.combatHeroEntity == heroDieEventData.combatHeroEntity)
+            {
+                b.HpBl = 0;
+                CombatController.currActiveCombat.MagicWeaponCombatSence.RemoveCollisionMagicWeapon(a.MagicWeaponCollisionId);
+                
+            }
+        }
 
         protected async void PongZhuang()
         {
@@ -317,6 +340,7 @@ namespace GameLogic.Combat.CombatTool
         {
             a = null;
             b = null;
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroDie, HeroDie);
         }
 
         public void Finish()

Assets/Scripts/GameLogic/Combat/CombatTool/MagicWeaponCombatSence.cs

@@ -43,6 +43,7 @@ namespace GameLogic.Combat.CombatTool
             {
                 magicWeaponCollisionInfoList.Value.Dispose();
             }
+
             magicWeaponCollisionInfoList.Clear();
             for (int i = 0; i < _enemyMagicWeaponList.Count; i++)
             {
@@ -61,6 +62,43 @@ namespace GameLogic.Combat.CombatTool
         public void Init()
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.MagicWeaponDie, MagicWeaponDie);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDie, HeroDie);
+        }
+
+        private void HeroDie(IEventData iEventData)
+        {
+            HeroDieEventData heroDieEventData = iEventData as HeroDieEventData;
+            CombatMagicWeaponEntity combatMagicWeaponEntity =
+                heroDieEventData.combatHeroEntity as CombatMagicWeaponEntity;
+            if (combatMagicWeaponEntity != null)
+            {
+                return;
+            }
+
+            if (heroDieEventData.combatHeroEntity.IsEnemy)
+            {
+                for (int i = 0; i < _enemyMagicWeaponList.Count; i++)
+                {
+                    if (_enemyMagicWeaponList[i].RootMagicWeaponControl.combatHeroEntity ==
+                        heroDieEventData.combatHeroEntity)
+                    {
+                        _enemyMagicWeaponList.RemoveAt(i);
+                        i--;
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < _playerMagicWeaponList.Count; i++)
+                {
+                    if (_playerMagicWeaponList[i].RootMagicWeaponControl.combatHeroEntity ==
+                        heroDieEventData.combatHeroEntity)
+                    {
+                        _playerMagicWeaponList.RemoveAt(i);
+                        i--;
+                    }
+                }
+            }
         }
 
         private void MagicWeaponDie(IEventData iEventData)

Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs

@@ -106,6 +106,11 @@ public class CombatAIBasic : IDisposable
 
     public virtual void ChangeState(string name, IStateEnterData iStateEnterData = null, bool isQiangZhi = false)
     {
+        if (stateControl == null)
+        {
+            return;
+        }
+
         stateControl.ChangeState(name, iStateEnterData, isQiangZhi);
     }
 

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroDieState.cs

@@ -70,17 +70,17 @@ namespace GameLogic.Combat.Hero.State
 
         protected override void ProUpdate(float t)
         {
-            if (isStartResurrection)
-            {
-                resurrectionTime += t;
-                if (resurrectionTime > 60)
-                {
-                    isSwitch = true;
-                    isStartResurrection = false;
-                    resurrectionTime = 0;
-                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Resurrection);
-                }
-            }
+            // if (isStartResurrection)
+            // {
+            //     resurrectionTime += t;
+            //     if (resurrectionTime > 60)
+            //     {
+            //         isSwitch = true;
+            //         isStartResurrection = false;
+            //         resurrectionTime = 0;
+            //         combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.Resurrection);
+            //     }
+            // }
         }
     }
 }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -171,6 +171,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         //扣除神识值 增加神识经验
         int xiaoHao = eventConfigs.Count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+        xiaoHao = xiaoHao > AccountFileInfo.Instance.playerData.divineSensePoint
+            ? (int)AccountFileInfo.Instance.playerData.divineSensePoint
+            : xiaoHao;
         AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
         AccountFileInfo.Instance.playerData.divineSensePoint -= xiaoHao;
 
@@ -548,7 +551,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
     //添加事件
     public AccountFileInfo.EventList AddEvent(int eventID)
     {
-
+        CanTriggerEvent(eventID);
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventID);
         AccountFileInfo.EventList eventList = null;
         if (eventConfig.ID == 0)
@@ -1134,7 +1137,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         return false;
                     }
 
-                    if (PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) >= evt.EventCount[i])
+                    if (PlayerManager.Instance.BagController.GetItemCount(evt.EventValue[i]) < evt.EventCount[i])
                     {
                         isCan = false;
                         return false;

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -129,7 +129,7 @@ namespace Fort23.Mono
                 TitleRoot.SetActive(true);
                 Rect_Sv.SetParent(Sv1root);
                 Rect_Sv.transform.SetAsFirstSibling();
-                Rect_Sv.offsetMax =new Vector2(11.88f,0);
+                Rect_Sv.offsetMax = new Vector2(11.88f, 0);
                 Rect_Sv.offsetMin = Vector2.zero;
                 // Rect_Sv.sizeDelta = new Vector2(718.82f, 844.7f);
                 // Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
@@ -174,7 +174,7 @@ namespace Fort23.Mono
                 TitleRoot.SetActive(false);
 
                 Rect_Sv.SetParent(Sv2root);
-                Rect_Sv.offsetMax  =new Vector2(11.88f,0);
+                Rect_Sv.offsetMax = new Vector2(11.88f, 0);
                 Rect_Sv.offsetMin = Vector2.zero;
                 Text_Tips.gameObject.SetActive(showEventList.Count > 0);
                 DivineSenceHuoQuWidgetGam.SetActive(false);
@@ -253,7 +253,7 @@ namespace Fort23.Mono
             {
                 ShengShiEventWidgetType2 shengShiEventWidgetType2 =
                     await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
+                await shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
                 shengShiEventWidgetType2.OnClick = OnClick;
                 shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
                 return shengShiEventWidgetType2;

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -79,12 +79,12 @@ namespace Fort23.Mono
 
             foreach (var keyValuePair in PlayerManager.Instance.BagController.allBagDic)
             {
-                if (keyValuePair.Value.config.associateID == 6)
+                if (keyValuePair.Value.config.associateID == 6 && keyValuePair.Value.count.Value > 0)
                 {
                     itemInfos1.Add(keyValuePair.Value);
                 }
 
-                if (keyValuePair.Value.config.associateID == 7)
+                if (keyValuePair.Value.config.associateID == 7 && keyValuePair.Value.count.Value > 0)
                 {
                     itemInfos2.Add(keyValuePair.Value);
                 }

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -73,7 +73,7 @@ namespace Fort23.Mono
                                               eventList.guid);
         }
 
-        public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
+        public async CTask CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
         {
             Text_Tips.gameObject.SetActive(false);
             Root.gameObject.SetActive(true);
@@ -110,8 +110,15 @@ namespace Fort23.Mono
                 csc.ChangeState(randomEventConfig.EventQuality - 1);
             }
 
-
-            Text_Go.text = LanguageManager.Instance.Text(10156);
+            if (eventList.isCompleted || eventList.isCompleted1)
+            {
+                Text_Go.text = LanguageManager.Instance.Text(10157);
+            }
+            else
+            {
+                Text_Go.text = LanguageManager.Instance.Text(10156);
+            }
+         
             if (eventLinkData == null || eventLinkData.eventConditions == null ||
                 eventLinkData.eventConditions.Count == 0)
             {
@@ -144,10 +151,10 @@ namespace Fort23.Mono
                 {
                     EventconditionState.ChangeState(1);
 
-                    if (evenkConfig.ResultType == 0 || evenkConfig.ResultType == 3)
-                    {
-                        Text_Go.text = LanguageManager.Instance.Text(10156);
-                    }
+                    // if (evenkConfig.ResultType == 0 || evenkConfig.ResultType == 3)
+                    // {
+                    //     Text_Go.text = LanguageManager.Instance.Text(10156);
+                    // }
                 }
                 else
                 {
@@ -158,7 +165,7 @@ namespace Fort23.Mono
                 Text_Eventcondition.text = desc;
             }
             
-
+         
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
                                               eventList.guid);
 

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase1.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono.Phases
             await pgm.ConfigLogic(101, delegate() { });
             pgm.SetOnClickMask(true);
 
-            BigPlacesChangeInfoPanel bigPlacesChangeInfoPanel = await BigPlacesChangeInfoPanel.OpenPanel(1);
+            BigPlacesChangeInfoPanel bigPlacesChangeInfoPanel = await BigPlacesChangeInfoPanel.OpenPanel(1, 2);
             await bigPlacesChangeInfoPanel.UIClosed();
             TipMessagePanelType2 tipMessagePanelType2 =
                 await TipMessagePanelType2.OpenTipMessagePanel(10131, isClose: false);
@@ -113,11 +113,11 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep103(UnityEngine.Object obj)
         {
             pgm.StepInit();
-            
+
             PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-          
-            
+
+
             GameObject gameObject = UIManager.Instance.GetComponent<MainPanel>().Btn_StartEvent.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidgetType1.cs

@@ -24,7 +24,7 @@ namespace Fort23.Mono
 		{
 			Text_Name.text = data.name;
 			// Text_Value.text = data.currentValue;
-			Text_Value.text = "+" + data.nextValue;
+			Text_Value.text = data.nextValue;
 			// Text_NextValue.text = data.nextValue;
 		}
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -120,6 +120,7 @@ namespace Fort23.Mono
                     //小突破
                     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
                     {
+                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
                         var heroAttributData =
                             HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, heroInfo);
                         PlayerManager.Instance.myHero.Upgrade();
@@ -156,7 +157,7 @@ namespace Fort23.Mono
                         await heroBreakthroughSuccessPanel.UIClosed();
 
 
-                        AudioManager.Instance.PlayAudio("ui_shengji.wav");
+                      
                     }
                     //大突破
                     else

Assets/Scripts/GameUI/UI/LevelChoosePanel/BigPlacesChangeInfoPanel.cs

@@ -5,45 +5,53 @@ using Fort23.UTool;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "BigPlacesChangeInfoPanel"  )]
-	public partial class BigPlacesChangeInfoPanel : UIPanel
-	{
-		private TimerEntity timerEntity;
-
-		private void Init()
-		{
-		}
-
-		protected override void AddEvent()
-		{
-		}
-
-		protected override void DelEvent()
-		{
-		}
-
-		public override void AddButtonEvent()
-		{
-		}
-
-		public override CTask<bool> AsyncInit(object[] uiData)
-		{
-			timerEntity?.Dispose();
-			timerEntity = null;
-			int placeId = int.Parse(uiData[0].ToString());
-			PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(placeId);
-			Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
-			timerEntity = TimerComponent.Instance.AddTimer(1500, () => { UIManager.Instance.HideUIUIPanel(this); });
-			return base.AsyncInit(uiData);
-		}
-
-		public static async CTask<BigPlacesChangeInfoPanel> OpenPanel(int placeId)
-		{
-			BigPlacesChangeInfoPanel placesChangeInfoPanel =
-				await UIManager.Instance.LoadAndOpenPanel<BigPlacesChangeInfoPanel>(null, UILayer.Top,
-					uiData: new object[] { placeId });
-			return placesChangeInfoPanel;
-		}
-
-	}
-}
+    [UIBinding(prefab = "BigPlacesChangeInfoPanel")]
+    public partial class BigPlacesChangeInfoPanel : UIPanel
+    {
+        private TimerEntity timerEntity;
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public override CTask<bool> AsyncInit(object[] uiData)
+        {
+            timerEntity?.Dispose();
+            timerEntity = null;
+            int type = int.Parse(uiData[1].ToString());
+            int placeId = int.Parse(uiData[0].ToString());
+            if (type == 1)
+            {
+                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(placeId);
+                Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
+            }
+            else
+            {
+                Text_PlacesName.text = "逍遥游";
+            }
+
+            timerEntity = TimerComponent.Instance.AddTimer(1500, () => { UIManager.Instance.HideUIUIPanel(this); });
+            return base.AsyncInit(uiData);
+        }
+
+        public static async CTask<BigPlacesChangeInfoPanel> OpenPanel(int placeId, int type = 1)
+        {
+            BigPlacesChangeInfoPanel placesChangeInfoPanel =
+                await UIManager.Instance.LoadAndOpenPanel<BigPlacesChangeInfoPanel>(null, UILayer.Top,
+                    uiData: new object[] { placeId, type });
+            return placesChangeInfoPanel;
+        }
+    }
+}

Packages/manifest.json

@@ -12,7 +12,7 @@
     "com.unity.ads": "4.4.2",
     "com.unity.analytics": "3.8.1",
     "com.unity.collab-proxy": "2.5.2",
-    "com.unity.device-simulator.devices": "1.0.0",
+    "com.unity.device-simulator.devices": "1.0.1",
     "com.unity.entities": "1.0.16",
     "com.unity.entities.graphics": "1.0.16",
     "com.unity.feature.2d": "2.0.1",

Packages/packages-lock.json

@@ -211,7 +211,7 @@
       "url": "https://packages.tuanjie.cn"
     },
     "com.unity.device-simulator.devices": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {},

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615