Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Art/UIAssets/bg/bg_lh_quelinger.png.meta   resolved by origin/master(远端) version
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version

.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

@@ -112,6 +112,76 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

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/SkillSelectPanel/SkillSelectPanel.prefab

@@ -37,7 +37,7 @@ 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: 2.4, y: 427}
+  m_AnchoredPosition: {x: 2.4, y: 438.6}
   m_SizeDelta: {x: 135.4431, y: 64.1194}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4309580754683082469
@@ -123,7 +123,7 @@ MonoBehaviour:
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_tiaozheng
-  isNotLoadDeftIcon: 1
+  isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
     packName: gongfa
@@ -171,7 +171,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -355, y: -804.6}
+  m_AnchoredPosition: {x: -337.1, y: -804.6}
   m_SizeDelta: {x: 94, y: 94}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &4355836709569313884
@@ -345,8 +345,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 292, y: -661.39}
-  m_SizeDelta: {x: 184.1, y: 51.8}
+  m_AnchoredPosition: {x: 303.6, y: -661.39}
+  m_SizeDelta: {x: 172, y: 47}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1203846129011065506
 CanvasRenderer:
@@ -739,7 +739,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.906083, g: 0.99244463, b: 0.9952829, a: 1}
+  m_Color: {r: 0.654902, g: 0.7725491, b: 0.7607844, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -748,8 +748,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
-    m_FontStyle: 0
+    m_FontSize: 26
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -820,7 +820,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8809184, g: 0.9438926, b: 0.9528301, a: 1}
+  m_Color: {r: 0.6431373, g: 0.70980394, b: 0.654902, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -828,8 +828,8 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 24
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -959,7 +959,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.976415, g: 0.9678775, b: 0.88890606, a: 1}
+  m_Color: {r: 0.9921569, g: 0.97647065, b: 0.8313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -969,7 +969,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 60
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 6
     m_MaxSize: 60
@@ -1447,8 +1447,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 225, y: -379.39}
-  m_SizeDelta: {x: 186.5, y: 47}
+  m_AnchoredPosition: {x: 237.5, y: -379.39}
+  m_SizeDelta: {x: 172, y: 47}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8777019402569436550
 CanvasRenderer:
@@ -1822,7 +1822,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 55.200012, y: -168.2185}
-  m_SizeDelta: {x: 72.46, y: 30}
+  m_SizeDelta: {x: 69.6064, y: 27.7519}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3243743412898019261
 CanvasRenderer:
@@ -2104,8 +2104,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: 214, y: 211}
-  m_SizeDelta: {x: 142.5, y: 47}
+  m_AnchoredPosition: {x: 225.1353, y: 200.8335}
+  m_SizeDelta: {x: 137.9815, y: 47}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3966226649241584167
 CanvasRenderer:
@@ -2321,7 +2321,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 36
+    m_FontSize: 34
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 3
@@ -2672,7 +2672,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
+    m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -2845,7 +2845,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.90214473, g: 0.9858489, b: 0.9774785, a: 1}
+  m_Color: {r: 0.654902, g: 0.77254903, b: 0.7607843, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2854,8 +2854,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
-    m_FontStyle: 0
+    m_FontSize: 26
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -3064,7 +3064,7 @@ GameObject:
   - component: {fileID: 3155142313046984080}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Image glow
+  m_Name: Image (4)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3110,7 +3110,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.22745097, g: 0.693571, b: 0.8666667, a: 0.45490196}
+  m_Color: {r: 0.227451, g: 0.69411767, b: 0.86666673, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3680,7 +3680,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -178.1, y: -338.9}
-  m_SizeDelta: {x: 320.8, y: 35.29}
+  m_SizeDelta: {x: 321.5699, y: 25.1006}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3178996994500239182
 CanvasRenderer:
@@ -3703,7 +3703,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.8588236, g: 0.96470594, b: 0.98823535, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3712,10 +3712,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 25
-    m_FontStyle: 0
+    m_FontSize: 20
+    m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 0
+    m_MinSize: 1
     m_MaxSize: 51
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -3723,7 +3723,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u529F\u6CD5\u76D8\u8FD0\u884C\u5468\u671F:9s"
+  m_Text: "\u529F\u6CD5\u76D8\u8FD0\u884C\u5468\u671F\uFF1A9s"
 --- !u!1 &3512407963766755592
 GameObject:
   m_ObjectHideFlags: 0
@@ -3812,7 +3812,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
-  imageH: 96
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4333,7 +4333,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.7169812, g: 0.6933073, b: 0.6933073, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -5374,7 +5374,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.25882354, g: 0.4156863, b: 0.41176474, a: 1}
+  m_Color: {r: 0.20392159, g: 0.3372549, b: 0.3019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -5527,7 +5527,7 @@ GameObject:
   - component: {fileID: 664522049210958919}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage dadaopan
+  m_Name: myImage
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -5909,7 +5909,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 48
+    m_FontSize: 53
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -5933,7 +5933,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.059963446, g: 0.23113191, b: 0.23113191, a: 1}
+  m_EffectColor: {r: 0.23529413, g: 0.43921572, b: 0.43921572, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
 --- !u!1 &7181239539594388838
@@ -6018,7 +6018,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.9999, y: 25}
+  m_AnchoredPosition: {x: 0.9999, y: 12.7}
   m_SizeDelta: {x: 321.5699, y: 50.9141}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &33174482886512446
@@ -6042,7 +6042,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6839621, g: 0.89553833, b: 0.9999999, a: 1}
+  m_Color: {r: 0.7843138, g: 0.95294124, b: 0.9843138, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6051,8 +6051,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 48
-    m_FontStyle: 0
+    m_FontSize: 50
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 51
@@ -6257,7 +6257,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17499542, g: 0.27735734, b: 0.3066036, a: 1}
+  m_Color: {r: 0.12941177, g: 0.18431373, b: 0.20000002, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6913,8 +6913,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -193, y: -49}
-  m_SizeDelta: {x: 348.62, y: 45.0141}
+  m_AnchoredPosition: {x: -209.1, y: -45.7}
+  m_SizeDelta: {x: 302.8486, y: 45.0141}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3339769281478272295
 CanvasRenderer:
@@ -6937,7 +6937,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.75294125, g: 0.8705883, b: 0.77647066, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -6945,12 +6945,12 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 300
+    m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1

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}
@@ -621,7 +621,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ShaderVariantCollection: {fileID: 20000000, guid: 3536136831feec548bbaa7febad775f8, type: 2}
   LoadType: 0
-  h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
+  h5Url: http://127.0.0.1:8000
   isOpenHotFix: 0
   isLoadDll: 0
 --- !u!4 &123020045
@@ -1453,6 +1453,221 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 773560728}
   m_CullTransparentMesh: 1
+--- !u!213 &786483581
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 389
+      y: 1229
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 389, y: 1229}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 446.5, z: 100, w: 1245.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}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &846380789
 GameObject:
   m_ObjectHideFlags: 0
@@ -1728,14 +1943,14 @@ Sprite:
     m_Bindpose: []
     textureRect:
       serializedVersion: 2
-      x: 443
-      y: 1457
+      x: 779
+      y: 1125
       width: 59
       height: 53
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 443, y: 1457}
+    atlasRectOffset: {x: 779, y: 1125}
     settingsRaw: 67
-    uvTransform: {x: 100, y: 472.5, z: 100, w: 1483.5}
+    uvTransform: {x: 100, y: 808.5, z: 100, w: 1151.5}
     downscaleMultiplier: 1
   m_PhysicsShape:
   - - {x: 0.155, y: -0.195}
@@ -2434,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:
@@ -2514,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}
@@ -2672,221 +2887,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7091770935250694576, guid: 10046a7863143ad43a1c1c9008538d89, type: 3}
   m_PrefabInstance: {fileID: 1733556487}
   m_PrefabAsset: {fileID: 0}
---- !u!213 &1762606480
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 290
-      y: 1525
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 290, y: 1525}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 347.5, z: 100, w: 1541.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}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &1831378551
 GameObject:
   m_ObjectHideFlags: 0
@@ -2945,7 +2945,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1762606480}
+  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/GameLogic/Player/SummonManager.cs

@@ -104,7 +104,7 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.oneConsume) || openBoxConfig.CostItemID == 1007)
                         {
-                            PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.oneConsume);
+                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,openBoxConfig.oneConsume);
                         }
                         else
                         {
@@ -172,7 +172,7 @@ namespace GameLogic.Player
                         if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID,
                                 openBoxConfig.tenConsume) || openBoxConfig.CostItemID == 1007)
                         {
-                            PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.tenConsume);
+                            PlayerManager.Instance.BagController.DeductItem(openBoxConfig.CostItemID,openBoxConfig.tenConsume);
                         }
                         else
                         {

Assets/Scripts/GameStart/GameLoadDll.cs

@@ -33,9 +33,12 @@ public class GameLoadDll
 
     private string[] localVersionInfo;
     private GameStart gameStart;
+    private string url;
 
     public void StartLoadDll(IDownloadUI downloadUI, GameStart gameStart, string url, System.Action callBack)
     {
+        this.url = url;
+        HotSyncContent.AssetURL = url;
         this.gameStart = gameStart;
         _downloadUI = downloadUI;
         _downloadUI.SetMassge("开始校验脚本");
@@ -128,7 +131,32 @@ public class GameLoadDll
         downloadHander.OnFinishCallBack = delegate(DownloadHander hander)
         {
             localVersionInfo = hander.Text.Split('\n');
-            GetAssetUrl();
+            DownloadRemoteVersion();
+            // GetAssetUrl();
+        };
+    }
+
+    private void DownloadRemoteVersion()
+    {
+        DownloadFileData versiondownloadFileData = new DownloadFileData();
+        versiondownloadFileData.remoteUrl = $"{HotSyncContent.AssetURL}/{HotSyncContent.platform}/{versionName}";
+        DownloadHander downloadHander = FileDownloadSystem.Instance.DownloadFile(versiondownloadFileData);
+        downloadHander.OnFinishCallBack = delegate(DownloadHander hander)
+        {
+            string[] remoteVersionInfo = hander.Text.Split('\n');
+            if (localVersionInfo[0].Split('=')[1] != remoteVersionInfo[0].Split('=')[1])
+            {
+                Debug.LogError("本地版本更大，不需要更新");
+            }
+            else
+            {
+                string apkver = remoteVersionInfo[0].Split('=')[1];
+                string buildVer = remoteVersionInfo[1].Split('=')[1];
+                string assetsVer = remoteVersionInfo[2].Split('=')[1];
+                HotSyncContent.Currversion = $"{apkver}.{buildVer}.{assetsVer}";
+                LoadMD5();
+            }
+            // GetAssetUrl();
         };
     }
 
@@ -316,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);
@@ -335,7 +363,7 @@ public class GameLoadDll
 
             return m;
         };
-        // _downloadUI.SetSlider(sliderData);
+        _downloadUI.SetSlider(sliderData);
 
         _checkFileThrans.Start(rootPath, CheckFile);
     }
@@ -416,7 +444,10 @@ public class GameLoadDll
     private void LoadDll()
     {
         _downloadUI.SetMassge($"初始化资源中，请稍等");
-
+#if UNITY_EDITOR
+        callBack?.Invoke();
+        return;
+#endif
 
         Debug.Log("开始Fort23.Proto");
         // System.Reflection.Assembly.Load(GetAssetBytes("Fort23.Proto.dll.bytes"));

Assets/Scripts/GameStart/GameStart.cs

@@ -53,7 +53,7 @@ public class GameStart : MonoBehaviour
         HotSyncContent.isOpenDllStreamingLoad = isLoadDll;
         HotSyncContent.isOpenHotFix = isOpenHotFix;
         GameLoadDll gameLoadDll = new GameLoadDll();
-        gameLoadDll.StartLoadDll(_gameStartUIPanel, this, "http://129.204.254.216:8080/resource/010test/init.dll",
+        gameLoadDll.StartLoadDll(_gameStartUIPanel, this, h5Url,
             DllLoadFinish);
         
     }

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

Assets/StreamingAssets/versionInfo.txt

@@ -0,0 +1,3 @@
+version=1
+buildVersion=1
+assetVersion=1

Assets/StreamingAssets/versionInfo.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ByxLsyyrBS1mh5RhZLDy19L+MoMUGZmDFXA6E7u5Ze8SjHoQMOuEaYfbj0+p
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

XiuXianGame.sln.DotSettings.user

@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAbstractProgressBar_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F40_003Fd60d7bd8_003FAbstractProgressBar_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAction_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003F34_003F73d88c36_003FAction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAction_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Ff4_003Fcb4805bc_003FAction_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAnimationCurve_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F61_003F47acc2d2_003FAnimationCurve_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAnimation_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fd5d119d079ba4539bb4c31261849caa227a00_003F91_003F0b4c4db3_003FAnimation_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -34,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>