修改热更新检查UI也使用FGUI界面

FGUIProject/assets/CheckForResUpdate/CheckForResUpdate.xml

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1280,720">
+<component size="900,1600">
   <displayList>
-    <image id="n0_rfuv" name="n0" src="rfuv2" fileName="Background.jpg" xy="0,0" size="1280,720">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <component id="n1_rfuv" name="processbar" src="rfuv4" fileName="CheckForResUpdateBar.xml" xy="111,616" size="1053,27" group="n4_rfuv">
+    <image id="n7_j5ra" name="n7" src="j5ra7" fileName="bg.png" xy="0,0"/>
+    <component id="n1_rfuv" name="processbar" src="rfuv4" fileName="CheckForResUpdateBar.xml" xy="20,1340" size="866,27">
       <ProgressBar value="100" max="100"/>
     </component>
-    <text id="n2_rfuv" name="updateInfo" xy="119,652" size="1033,43" group="n4_rfuv" fontSize="20" color="#8be8f0" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" strokeSize="0.2" text="正在为您检查版本更新：100%"/>
-    <group id="n4_rfuv" name="n4" xy="111,616" size="1053,79" advanced="true">
-      <relation target="" sidePair="center-center,bottom-bottom"/>
-    </group>
+    <text id="n2_rfuv" name="updateInfo" xy="0,1365" size="900,43" fontSize="30" color="#00ffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" strokeSize="0.2" text="正在为您检查版本更新：100%"/>
   </displayList>
 </component>

FGUIProject/assets/CheckForResUpdate/package.xml

@@ -3,9 +3,9 @@
   <resources>
     <component id="rfuv0" name="CheckForResUpdate.xml" path="/" exported="true"/>
     <image id="rfuv1" name="Bar.PNG" path="/"/>
-    <image id="rfuv2" name="Background.jpg" path="/"/>
     <image id="rfuv3" name="BarBackGround.PNG" path="/" scale="9grid" scale9grid="40,10,50,20"/>
     <component id="rfuv4" name="CheckForResUpdateBar.xml" path="/"/>
+    <image id="j5ra7" name="bg.png" path="/"/>
   </resources>
-  <publish name="" path="../../Unity/Assets/Resources/FGUI/" packageCount="2" genCode="true" codePath="D:\Study\GameProject\NKGMobaBasedOnET\Unity\Assets\Model\NKGMOBA\FairyGUI\AutoGeneratedCode"/>
+  <publish name="" path="../Unity/Assets/Resources/FGUI/" packageCount="2" codePath="../Unity\Assets\Scripts\Loader\MonoBehaviour"/>
 </packageDescription>

FGUIProject/settings/Adaptation.json

@@ -0,0 +1,14 @@
+{
+  "scaleMode": "ScaleWithScreenSize",
+  "screenMathMode": "MatchWidth",
+  "designResolutionX": 900,
+  "designResolutionY": 1600,
+  "devices": [
+    {
+      "name": "noname",
+      "resolutionX": 1600,
+      "resolutionY": 900
+    }
+  ],
+  "fileName": "Adaptation"
+}

FGUIProject/settings/CustomProperties.json

@@ -0,0 +1 @@
+{}

FGUIProject/settings/i18n.json

@@ -0,0 +1,3 @@
+{
+  "langFiles": []
+}

Unity/Assets/Resources/HotfixUI/Bar.PNG.meta → Unity/Assets/Resources/FGUI/CheckForResUpdate_atlas0.png.meta

@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: a2077eb6fd2ef63409fb91a856f25c09
+guid: 4fe57358e950dfd4c91fae6875d1b8ed
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -39,10 +39,10 @@ TextureImporter:
     wrapU: 0
     wrapV: 0
     wrapW: 0
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -107,7 +107,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 5e97eb03825dee720800000000000000
+    spriteID: 
     internalID: 0
     vertices: []
     indices: 

Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/Scene.meta → Unity/Assets/Resources/FGUI/CheckForResUpdate_fui.bytes.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: abee6d96c00081549adc0cdc687ceb08
-folderAsset: yes
-DefaultImporter:
+guid: 10e31d16a1e8c2341b6902b45e216823
+TextScriptImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Unity/Assets/Resources/HotfixUI.meta

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

Unity/Assets/Resources/HotfixUI/Background.jpg.meta

@@ -1,123 +0,0 @@
-fileFormatVersion: 2
-guid: 5da29c2c3c48efe4286c5674ddf6a760
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  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
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 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: 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: 0
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Resources/HotfixUI/BarBackGround.PNG.meta

@@ -1,123 +0,0 @@
-fileFormatVersion: 2
-guid: 8735ba64155e490478e0c0266492ab3b
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  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
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 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: 1
-  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: 27, y: 4, z: 28, w: 3}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 1537655665
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Resources/background.png.meta

@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: 6c8adde126519b1468d6cba84997792c
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  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
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 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
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Loader/FGUIMgr.meta

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

Unity/Assets/Scripts/Loader/MonoBehaviour/CheckResUpdate.cs

@@ -1,7 +1,5 @@
-using System.Collections;
-using System.Collections.Generic;
+using FairyGUI;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace ET
 {
@@ -9,26 +7,30 @@ namespace ET
     {
         void Start()
         {
-            var progress = this.gameObject.transform.Find("Img_bar").gameObject.GetComponent<Image>();
-            var txtProgress = this.gameObject.transform.Find("Text_progress").gameObject.GetComponent<Text>();
+            var view = UIPackage.CreateObject("CheckForResUpdate", "CheckForResUpdate").asCom;
+            GRoot.inst.AddChild(view);
 
+            var progress = view.GetChild("processbar").asProgress;
+            var txtProgress = view.GetChild("updateInfo");
+            
             YooAssetProxy.InitHostCallbacks((onStateChanged) =>
             {
                 txtProgress.text = onStateChanged.CurrentStates.ToString();
 
                 if (onStateChanged.CurrentStates == EPatchStates.PatchDone)
                 {
-                    txtProgress.text = "资源下载完毕，正在加载核心逻辑。。。";
+                    progress.value = 1f;
+                    txtProgress.text = "加载游戏中……";
                 }
             }, (onProcessUpdated) =>
             {
                 string currentSizeMB = (onProcessUpdated.CurrentDownloadSizeBytes / 1048576f).ToString("f1");
                 string totalSizeMB = (onProcessUpdated.TotalDownloadSizeBytes / 1048576f).ToString("f1");
                 string text =
-                    $"资源下载中：{onProcessUpdated.CurrentDownloadCount}/{onProcessUpdated.TotalDownloadCount} {currentSizeMB}MB/{totalSizeMB}MB";
+                    $"更新资源中：{onProcessUpdated.CurrentDownloadCount}/{onProcessUpdated.TotalDownloadCount} {currentSizeMB}MB/{totalSizeMB}MB";
 
                 txtProgress.text = text;
-                progress.fillAmount = onProcessUpdated.CurrentDownloadSizeBytes * 1.0f /
+                progress.value = onProcessUpdated.CurrentDownloadSizeBytes * 1.0f /
                     onProcessUpdated.TotalDownloadSizeBytes;
             });
         }

Unity/Assets/Scripts/Loader/Unity.Loader.asmdef

@@ -7,7 +7,8 @@
         "YooAsset",
         "UniTask",
         "UniTask.YooAsset",
-        "HybridCLR.Runtime"
+        "HybridCLR.Runtime",
+        "FairyGUI.Runtime"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Unity/Assets/Scripts/Loader/YooAssetMgr/PatchUpdater/PatchUpdater.cs

@@ -5,6 +5,7 @@ using Cysharp.Threading.Tasks;
 using UnityEngine;
 using YooAsset;
 using ET;
+using static PatchEventMessageDefine;
 
 public static class PatchUpdater
 {
@@ -162,6 +163,10 @@ public static class PatchUpdater
         {
             Log.Warning($"Retry {_retryCnt} times, Abort.");
             s_UniTaskCompletionSource?.TrySetResult();
+
+            var state = new PatchStatesChange();
+            state.CurrentStates = EPatchStates.PatchDone;
+            OnStateUpdate?.Invoke(state);
         }
         else
         {

Unity/ProjectSettings/ProjectSettings.asset

@@ -48,8 +48,8 @@ PlayerSettings:
   m_SloganImage: {fileID: 0}
   m_SloganHeight: 150
   m_HolographicTrackingLossScreen: {fileID: 0}
-  defaultScreenWidth: 1024
-  defaultScreenHeight: 768
+  defaultScreenWidth: 640
+  defaultScreenHeight: 960
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
@@ -109,7 +109,7 @@ PlayerSettings:
   xboxEnableKinectAutoTracking: 0
   xboxEnableFitness: 0
   visibleInBackground: 0
-  allowFullscreenSwitch: 1
+  allowFullscreenSwitch: 0
   fullscreenMode: 3
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
@@ -140,11 +140,11 @@ PlayerSettings:
   vulkanEnableLateAcquireNextImage: 0
   vulkanEnableCommandBufferRecycling: 1
   m_SupportedAspectRatios:
-    4:3: 1
-    5:4: 1
-    16:10: 1
-    16:9: 1
-    Others: 1
+    4:3: 0
+    5:4: 0
+    16:10: 0
+    16:9: 0
+    Others: 0
   bundleVersion: 1.0.0
   preloadedAssets: []
   metroInputSource: 0