修改bug

.gitignore

@@ -13,3 +13,4 @@ XY001.sln.DotSettings.user
 minigame
 webgl
 HybridCLRData
+Assets/StreamingAssets/assetBundle.zip

Assets/Art/UIAssets/bg/bg_lh_quelinger.png.meta

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

Assets/Art/UIAssets/bg/bg_lh_yaoshou2.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_lh_yaoshou2
   assetBundleVariant: 

Assets/Art/UIAssets/bg/bg_vs.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_vs
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_jiangli_loop.prefab.meta

@@ -3,5 +3,5 @@ guid: DHga4X78Wn9ibVscX4gJZEE2XT1LY2iuWbCgd8uXZOA5E4OvMKzKVm6TMSw+
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_jiangli_loop
   assetBundleVariant: 

Assets/Res/UI/DialoguePanel/DialgueType1.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: dialguetype1
   assetBundleVariant: 

Assets/Res/UI/DialoguePanel/DialgueType1idle.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: dialguetype1idle
   assetBundleVariant: 

Assets/Res/UI/DialoguePanel/DialgueType1idle1.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: dialguetype1idle1
   assetBundleVariant: 

Assets/Res/UI/DialoguePanel/DialgueType1open.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: dialguetype1open
   assetBundleVariant: 

Assets/Res/UI/DialoguePanel/DialogueOptionWidget.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: dialogueoptionwidget
   assetBundleVariant: 

Assets/Res/UI/DialoguePanel/DialogueOptionWidgetopen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: dialogueoptionwidgetopen
   assetBundleVariant: 

Assets/Res/UI/DivineSence/ComBatFrontPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: CihKtir8WihxTi42QYkld79silS1Me20VcJ0HfAR0XwmM/jLmdg5+ZfCd0ID
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: bossinfopanel
+  assetBundleName: combatfrontpanel
   assetBundleVariant: 

Assets/Res/UI/DivineSence/ComBatFrontWidget.prefab.meta

@@ -3,5 +3,5 @@ guid: BigZ4Cv7BS00O3cAqvfe2i+msTz3wo0KjPaFZnGW/vanVpzVbTBxFwhg3tg0
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: bossinfoheadwidget
+  assetBundleName: combatfrontwidget
   assetBundleVariant: 

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

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: "\u6218\u6597\u754C\u9762-\u6218\u524D\u4FE1\u606F1"
   assetBundleVariant: 

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

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: "\u6218\u6597\u754C\u9762-\u6218\u524D\u8BE6\u60C5"
   assetBundleVariant: 

Assets/Res/UI/TowerPanel/TowerPanel.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: towerpanel
   assetBundleVariant: 

Assets/Res/UI/TowerPanel/TowerPanelopen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: towerpanelopen
   assetBundleVariant: 

Assets/Res/UI/UIanima/FaBaoNameOpen.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: fabaonameopen
   assetBundleVariant: 

Assets/Res/UI/UIanima/FaBaoSkillNameWidget.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fabaoskillnamewidget
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoSkillInfopanel.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfoskillinfopanel
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfonextIcon.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfonexticon
   assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -243,7 +243,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    texture: {fileID: 2800000, guid: be36d32279c7e2e47afadd96517fdbc6, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -323,14 +323,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 846.0761
-      y: 639.0761
+      x: 22.07612
+      y: 15.07612
       width: 206.84775
       height: 206.84775
     textureRectOffset: {x: 22.07612, y: 15.07612}
-    atlasRectOffset: {x: 824, y: 624}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 948, z: 100, w: 742}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 124, z: 100, w: 118}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.78999996, y: -0.68}
@@ -571,14 +571,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 1925
-      y: 329
+      x: 939
+      y: 1082
       width: 28
       height: 29
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 1925, y: 329}
+    atlasRectOffset: {x: 939, y: 1082}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 1939, z: 100, w: 343.5}
+    uvTransform: {x: 100, y: 953, z: 100, w: 1096.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: -0.14, y: 0.145}
@@ -1453,95 +1453,19 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 773560728}
   m_CullTransparentMesh: 1
---- !u!1 &846380789
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 846380790}
-  - component: {fileID: 846380792}
-  - component: {fileID: 846380791}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: logo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &846380790
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 846380789}
-  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: 753442136}
-  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: 5, y: -216}
-  m_SizeDelta: {x: 497, y: 313}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &846380791
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 846380789}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c445c0199876d6c4f954649a5f0863a3, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &846380792
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 846380789}
-  m_CullTransparentMesh: 1
---- !u!213 &980542365
+--- !u!213 &786483581
 Sprite:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: dec_fuhao_cz(Clone)
+  m_Name: dec_jianbian_tiao(Clone)
   m_Rect:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 59
-    height: 53
+    width: 115
+    height: 33
   m_Offset: {x: 0, y: 0}
   m_Border: {x: 0, y: 0, z: 0, w: 0}
   m_PixelsToUnits: 100
@@ -1551,30 +1475,30 @@ Sprite:
   m_AtlasName: 
   m_PackingTag: 
   m_RenderDataKey:
-    e2c9147f14345e74d80ab86f70f34946: 21300000
+    c0c46614f24bc234b92e828eae8336c3: 21300000
   m_AtlasTags:
   - tongyong
   m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   m_RD:
     serializedVersion: 3
-    texture: {fileID: 2800000, guid: e2c9147f14345e74d80ab86f70f34946, type: 3}
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
     - serializedVersion: 2
       firstByte: 0
-      indexCount: 18
+      indexCount: 6
       topology: 0
       baseVertex: 0
       firstVertex: 0
-      vertexCount: 8
+      vertexCount: 4
       localAABB:
         m_Center: {x: 0, y: 0, z: 0}
         m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 070006000400050004000600000004000500030004000000010003000000020001000000
+    m_IndexBuffer: 030000000100020001000000
     m_VertexData:
       serializedVersion: 3
-      m_VertexCount: 8
+      m_VertexCount: 4
       m_Channels:
       - stream: 0
         offset: 0
@@ -1632,19 +1556,19 @@ Sprite:
         offset: 0
         format: 0
         dimension: 0
-      m_DataSize: 160
-      _typelessdata: cdcc8c3e14ae873e000000003d0a973e333333be000000003d0a973e6666663e0000000048e17a3e14ae87be0000000085eb51be14ae87be0000000048e17abe14ae873e000000003d0a97be5c8f823e000000003d0a97bef6285cbe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
       x: 0
       y: 0
-      width: 59
-      height: 53
+      width: 115
+      height: 33
     textureRectOffset: {x: 0, y: 0}
     atlasRectOffset: {x: -1, y: -1}
     settingsRaw: 64
-    uvTransform: {x: 100, y: 29.5, z: 100, w: 26.5}
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
@@ -1654,18 +1578,18 @@ Sprite:
     m_SubMeshes:
     - serializedVersion: 2
       firstByte: 0
-      indexCount: 18
+      indexCount: 6
       topology: 0
       baseVertex: 0
       firstVertex: 0
-      vertexCount: 8
+      vertexCount: 4
       localAABB:
         m_Center: {x: 0, y: 0, z: 0}
         m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 070006000400050004000600000004000500030004000000010003000000020001000000
+    m_IndexBuffer: 030000000100020001000000
     m_VertexData:
       serializedVersion: 3
-      m_VertexCount: 8
+      m_VertexCount: 4
       m_Channels:
       - stream: 0
         offset: 0
@@ -1723,50 +1647,116 @@ Sprite:
         offset: 0
         format: 0
         dimension: 0
-      m_DataSize: 160
-      _typelessdata: cdcc8c3e14ae873e000000003d0a973e333333be000000003d0a973e6666663e0000000048e17a3e14ae87be0000000085eb51be14ae87be0000000048e17abe14ae873e000000003d0a97be5c8f823e000000003d0a97bef6285cbe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 443
-      y: 1457
-      width: 59
-      height: 53
+      x: 389
+      y: 1229
+      width: 115
+      height: 33
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 443, y: 1457}
+    atlasRectOffset: {x: 389, y: 1229}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 472.5, z: 100, w: 1483.5}
+    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
-  - - {x: 0.155, y: -0.195}
-    - {x: 0.195, y: -0.185}
-    - {x: 0.295, y: -0.125}
-    - {x: 0.295, y: 0.055}
-    - {x: 0.265, y: 0.21499999}
-    - {x: 0.114999995, y: 0.265}
-    - {x: -0.195, y: 0.265}
-    - {x: -0.295, y: 0.185}
-    - {x: -0.295, y: -0.13499999}
-    - {x: -0.235, y: -0.265}
-    - {x: -0.005, y: -0.265}
-    - {x: -0.005, y: -0.155}
-    - {x: 0.005, y: 0.13499999}
-    - {x: 0.024999999, y: 0.005}
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
---- !u!213 &1041840125
+--- !u!1 &846380789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 846380790}
+  - component: {fileID: 846380792}
+  - component: {fileID: 846380791}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: logo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &846380790
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846380789}
+  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: 753442136}
+  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: 5, y: -216}
+  m_SizeDelta: {x: 497, y: 313}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &846380791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846380789}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c445c0199876d6c4f954649a5f0863a3, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &846380792
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846380789}
+  m_CullTransparentMesh: 1
+--- !u!213 &980542365
 Sprite:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
+  m_Name: dec_fuhao_cz(Clone)
   m_Rect:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 115
-    height: 33
+    width: 59
+    height: 53
   m_Offset: {x: 0, y: 0}
   m_Border: {x: 0, y: 0, z: 0, w: 0}
   m_PixelsToUnits: 100
@@ -1776,30 +1766,30 @@ Sprite:
   m_AtlasName: 
   m_PackingTag: 
   m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
+    e2c9147f14345e74d80ab86f70f34946: 21300000
   m_AtlasTags:
   - tongyong
   m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   m_RD:
     serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    texture: {fileID: 2800000, guid: e2c9147f14345e74d80ab86f70f34946, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
     - serializedVersion: 2
       firstByte: 0
-      indexCount: 6
+      indexCount: 18
       topology: 0
       baseVertex: 0
       firstVertex: 0
-      vertexCount: 4
+      vertexCount: 8
       localAABB:
         m_Center: {x: 0, y: 0, z: 0}
         m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
+    m_IndexBuffer: 070006000400050004000600000004000500030004000000010003000000020001000000
     m_VertexData:
       serializedVersion: 3
-      m_VertexCount: 4
+      m_VertexCount: 8
       m_Channels:
       - stream: 0
         offset: 0
@@ -1857,19 +1847,19 @@ Sprite:
         offset: 0
         format: 0
         dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+      m_DataSize: 160
+      _typelessdata: cdcc8c3e14ae873e000000003d0a973e333333be000000003d0a973e6666663e0000000048e17a3e14ae87be0000000085eb51be14ae87be0000000048e17abe14ae873e000000003d0a97be5c8f823e000000003d0a97bef6285cbe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
       x: 0
       y: 0
-      width: 115
-      height: 33
+      width: 59
+      height: 53
     textureRectOffset: {x: 0, y: 0}
     atlasRectOffset: {x: -1, y: -1}
     settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    uvTransform: {x: 100, y: 29.5, z: 100, w: 26.5}
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
@@ -1879,18 +1869,18 @@ Sprite:
     m_SubMeshes:
     - serializedVersion: 2
       firstByte: 0
-      indexCount: 6
+      indexCount: 18
       topology: 0
       baseVertex: 0
       firstVertex: 0
-      vertexCount: 4
+      vertexCount: 8
       localAABB:
         m_Center: {x: 0, y: 0, z: 0}
         m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
+    m_IndexBuffer: 070006000400050004000600000004000500030004000000010003000000020001000000
     m_VertexData:
       serializedVersion: 3
-      m_VertexCount: 4
+      m_VertexCount: 8
       m_Channels:
       - stream: 0
         offset: 0
@@ -1948,25 +1938,35 @@ Sprite:
         offset: 0
         format: 0
         dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+      m_DataSize: 160
+      _typelessdata: cdcc8c3e14ae873e000000003d0a973e333333be000000003d0a973e6666663e0000000048e17a3e14ae87be0000000085eb51be14ae87be0000000048e17abe14ae873e000000003d0a97be5c8f823e000000003d0a97bef6285cbe0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 290
-      y: 1525
-      width: 115
-      height: 33
+      x: 779
+      y: 1125
+      width: 59
+      height: 53
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 290, y: 1525}
+    atlasRectOffset: {x: 779, y: 1125}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 347.5, z: 100, w: 1541.5}
+    uvTransform: {x: 100, y: 808.5, z: 100, w: 1151.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
+  - - {x: 0.155, y: -0.195}
+    - {x: 0.195, y: -0.185}
+    - {x: 0.295, y: -0.125}
+    - {x: 0.295, y: 0.055}
+    - {x: 0.265, y: 0.21499999}
+    - {x: 0.114999995, y: 0.265}
+    - {x: -0.195, y: 0.265}
+    - {x: -0.295, y: 0.185}
+    - {x: -0.295, y: -0.13499999}
+    - {x: -0.235, y: -0.265}
+    - {x: -0.005, y: -0.265}
+    - {x: -0.005, y: -0.155}
+    - {x: 0.005, y: 0.13499999}
+    - {x: 0.024999999, y: 0.005}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &1080868191
@@ -2649,7 +2649,7 @@ Sprite:
     downscaleMultiplier: 1
   m_AtlasRD:
     serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    texture: {fileID: 2800000, guid: be36d32279c7e2e47afadd96517fdbc6, type: 3}
     alphaTexture: {fileID: 0}
     secondaryTextures: []
     m_SubMeshes:
@@ -2729,14 +2729,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 846.0761
-      y: 639.0761
+      x: 22.07612
+      y: 15.07612
       width: 206.84775
       height: 206.84775
     textureRectOffset: {x: 22.07612, y: 15.07612}
-    atlasRectOffset: {x: 824, y: 624}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 948, z: 100, w: 742}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 124, z: 100, w: 118}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.78999996, y: -0.68}
@@ -2945,7 +2945,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1041840125}
+  m_Sprite: {fileID: 786483581}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scripts/Core/Editor/BuildEtitor/BuildEditor.cs

@@ -222,7 +222,7 @@ namespace Fort23.Editor
 
 
                 md5Info.size = fileInfo.Length;
-                md5Info.fileName = Path.GetFileName(bundle);
+                md5Info.fileName = Path.GetFileName(p);
                 assetMd5Info.fileInfo.Add(md5Info);
             }
 

Assets/Scripts/GameStart/GameLoadDll.cs

@@ -344,7 +344,7 @@ public class GameLoadDll
             float m = _checkFileThrans.FileCount();
             if (_checkFileThrans.isFinish)
             {
-                // _downloadUI.ClearSlider();
+                _downloadUI.ClearSlider();
                 if (_checkFileThrans.shiBaiFile != null && _checkFileThrans.shiBaiFile.Count > 0)
                 {
                     DownJiaoBen(_checkFileThrans.shiBaiFile);
@@ -363,7 +363,7 @@ public class GameLoadDll
 
             return m;
         };
-        // _downloadUI.SetSlider(sliderData);
+        _downloadUI.SetSlider(sliderData);
 
         _checkFileThrans.Start(rootPath, CheckFile);
     }

Assets/Scripts/GameStart/GameStartUIPanel.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Obfuz;
@@ -5,6 +6,7 @@ using ThirdParty.DownloadSystem;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
+
 [ObfuzIgnore]
 public class GameStartUIPanel : MonoBehaviour, IDownloadUI
 {
@@ -12,6 +14,8 @@ public class GameStartUIPanel : MonoBehaviour, IDownloadUI
 
     public Slider loadSlider;
 
+    private SliderData sliderData;
+
     public void ShowMassge(string massge)
     {
         massgeText.text = massge;
@@ -21,10 +25,13 @@ public class GameStartUIPanel : MonoBehaviour, IDownloadUI
 
     public void ClearSlider()
     {
+        sliderData = null;
     }
 
     public void SetSlider(SliderData sliderData)
     {
+        this.sliderData = sliderData;
+        loadSlider.maxValue = sliderData.maxValue;
     }
 
     [ObfuzIgnore]
@@ -41,6 +48,15 @@ public class GameStartUIPanel : MonoBehaviour, IDownloadUI
     {
     }
 
+    private void Update()
+    {
+        if (sliderData != null)
+        {
+            float m = sliderData.CcurrValue.Invoke();
+            SetSlider(m);
+        }
+    }
+
     public string GetLoadingText(int id)
     {
         return "";

Assets/Scripts/GameUI/GameApplction.cs

@@ -15,6 +15,7 @@ using GameLogic.NetworkClient;
 using GameLogic.Player;
 using GameUI;
 using NetCore.Protocol.MemoryPack;
+using ThirdParty;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -43,6 +44,7 @@ public class GameApplction : IGameStart
     public async void StartGame(LoadType LoadType, string h5Url, GameStartUIPanel gameStartUIPanel,
         System.Action LoadFinish)
     {
+        HotSyncContent.DownloadUI= gameStartUIPanel;
         this.LoadFinish = LoadFinish;
         gameApplction = this;
         Debug.Log("开始游戏逻辑");

Assets/StreamingAssets/assetMD5.txt

@@ -1 +1 @@
-638963124905688068
+638966434934940897

XiuXianGame.sln.DotSettings.user

@@ -35,6 +35,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F78_003Fe39b72ca_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFunc_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F7d_003F1afce2dc_003FFunc_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGraphicsBuffer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F3a_003F867eec19_003FGraphicsBuffer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIGrouping_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fb1_003F69de2d9e_003FIGrouping_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIMGUIContainer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F2c_003F134ee6ec_003FIMGUIContainer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>