更新资产

Assets/Domain/Main/AddressableRes/Config/DomainConfig.asset

@@ -11,22 +11,24 @@ MonoBehaviour:
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 03dc1bf5b95446838cce6d0fefed81fe, type: 3}
   m_Name: DomainConfig
-  m_EditorClassIdentifier: 
+  m_EditorClassIdentifier:
   serializationData:
     SerializedFormat: 2
-    SerializedBytes: 
+    SerializedBytes:
     ReferencedUnityObjects: []
-    SerializedBytesString: 
+    SerializedBytesString:
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
     PrefabModifications: []
     SerializationNodes: []
   domain: Main
   namespace: Main
+  assemblyName: HotUpdate_Main
   className: MainDomain
   loadResType: 0
-  mainPrefab: Prefabs_Main
   sceneAsset: {fileID: 0}
+  domainLoadType: 1
   loadSceneMode: 0
-  scenePath: 
-  sceneIdentifier: 
+  mainPrefab: Prefabs_Main
+  scenePath:
+  sceneIdentifier:

Assets/Domain/Main/AddressableRes/Dll/WebGL.meta

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

Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6994074d165fc5347a314dea318307db
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 425880c9db860cd4db22b37e72aae351
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2a78bd872d7d72d47bae8a2144dee88e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: feb34dd2fa0b55a489044a42de66e12e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cd4ef6b4eadfeaa4a9e6d3675609a227
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 09db289a236e48e4e85db0dc6571f0eb
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: def98fe25f17433428077fa3d8e49995
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c225114d6adba4c4ab2628af2bf1265a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e24a0a82585670f4caffc545d4ac1588
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f707e91e063ddf24faa37eb365c2a465
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Prefabs/Main.prefab

@@ -9,6 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3514453182734524708}
+  - component: {fileID: 7145948053964530355}
   m_Layer: 0
   m_Name: Main
   m_TagString: Untagged
@@ -31,3 +32,43 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7145948053964530355
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8041623471124902942}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 550b2f30af9635045803b99a475a03ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mationID: 37794
+  _list:
+  - desc: "\u521D\u59CB"
+    localPosition:
+      x: 0
+      y: 0
+      z: 0
+    localEulerAngles:
+      x: -0
+      y: 0
+      z: 0
+    localScale:
+      x: 1
+      y: 1
+      z: 1
+  - desc: "\u521D\u59CB"
+    localPosition:
+      x: 0
+      y: 0
+      z: 0
+    localEulerAngles:
+      x: -0
+      y: 0
+      z: 0
+    localScale:
+      x: 1
+      y: 1
+      z: 1

Assets/Domain/Main/Conf/BuildAssetDataSetting.asset

@@ -24,11 +24,10 @@ MonoBehaviour:
   packageName: Main
   packageVersionX: 1
   packageVersionY: 0
-  packageVersionZ: 10
+  packageVersionZ: 2
   environmentType: 1
-  selectedBuildPipelines: 2
-  packageVersion: 1.0.10
-  VersionType: 0
+  packageVersion: 1.0.2
+  VersionType: 2
   viewer:
     clearBuildCacheToggle: 0
     useAssetDependencyDBToggle: 1

Assets/Domain/Main/HotUpdate/DomainPanel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Stary.Evo;
-using Stary.Evo.RKTools;
 using Stary.Evo.UIFarme;
 using UnityEngine;
 using UnityEngine.UI;
@@ -11,6 +10,7 @@ namespace Main
 {
     public class DomainPanel : BasePanel, IBasePanel
     {
+        public override string UIPath => "/DomainPanel";
         public override UITweenType TweenType => UITweenType.Fade;
 
         private string[] domains;
@@ -51,7 +51,7 @@ namespace Main
             StringEventSystem.Global.Send("X_ButtonHierarchyType",DeviceXEventHandler.HierarchyType.Domain);
             for (int i = 0; i < _domainGrids.Length; i++)
             {
-                _domainGrids[i].gameObject.ObjectAddTouchEvent(OnTouchComplete);
+                //_domainGrids[i].gameObject.ObjectAddTouchEvent(OnTouchComplete);
             }
 
             base.OnEnter(complete);
@@ -61,14 +61,14 @@ namespace Main
         {
             for (int i = 0; i < _domainGrids.Length; i++)
             {
-                _domainGrids[i].gameObject.ObjectPauseTouchEvent();
+               // _domainGrids[i].gameObject.ObjectPauseTouchEvent();
             }
 
             HybridClREntrance.Global.domain = go.name;
             await HybridClREntrance.Global.OpenDomain();
 
             await this.GetSystem<IPanelSystem>()
-                .PushStack<ScenePanel>(packageName: "Main", parent: panelParent.transform);
+                .PushStack<ScenePanel>(packageName: "Main");
             this.GetSystem<IPanelSystem>().SendEvent("SetSceneData", go.name);
         }
 
@@ -76,7 +76,7 @@ namespace Main
         {
             for (int i = 0; i < _domainGrids.Length; i++)
             {
-                _domainGrids[i].gameObject.ObjectRemoveTouchEvent();
+                //_domainGrids[i].gameObject.ObjectRemoveTouchEvent();
             }
 
             base.OnExit(delay);

Assets/Domain/Main/HotUpdate/HotUpdate_Main.asmdef

@@ -4,11 +4,11 @@
     "references": [
         "GUID:d1a793c2b6959e04ea45b972eaa369c8",
         "GUID:f3fa071c399c4383a9ff8115e53dfefc",
-        "GUID:6055be8ebefd69e48b49212b09b47b2f",
         "GUID:10c9b58b77ad42b4193e2a393b1a9899",
         "GUID:fad681b9bfe621d4fa07f4f69c311443",
         "GUID:8c6fa7c2cd7bf784e856d9adb3dc2ada",
-        "GUID:a3794f8c932de3d47b12dc5eac703d09"
+        "GUID:a3794f8c932de3d47b12dc5eac703d09",
+        "GUID:e34a5702dd353724aa315fb8011f08c3"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Domain/Main/HotUpdate/MainDomain.cs

@@ -2,9 +2,11 @@ using System.Threading.Tasks;
 using Stary.Evo;
 using Stary.Evo.UIFarme;
 using UnityEngine;
+using UnityEngine.Scripting;
 
 namespace Main
 {
+    [Preserve]
     public class MainDomain : DomainBase, IController
     {
         public override void OnEnter(string param)
@@ -25,7 +27,7 @@ namespace Main
         {
             await base.OnEnterAsync(param);
             Debug.Log("UnityEvo: OnEnterAsync进入成功");
-            await this.GetSystem<IPanelSystem>().PushStack<DomainPanel>(parent: this.transform);
+            await this.GetSystem<IPanelSystem>().PushStack<DomainPanel>();
             StringEventSystem.Global.Register("Rollback", OnRollback);
         }
 
@@ -54,7 +56,7 @@ namespace Main
         {
             //注册示例
             //RegisterSystem<IScoreSystem>(new ScoreSystem());
-            RegisterSystem<IPanelSystem>(new PanelSystem());
+            RegisterSystem<IPanelSystem>(new PanelSystem(new YooAssetLoader()));
         }
     }
 }

Assets/Domain/Main/HotUpdate/Res.cs

@@ -26,6 +26,19 @@ namespace R
 							public const string unityengine_coremodule_dll_bytes = "Android_UnityEngine.CoreModule.dll";
 							public const string yooasset_dll_bytes = "Android_YooAsset.dll";
 					}
+					 public static class webgl
+					{
+							public const string com_stary_evo_runtime_dll_bytes = "WebGL_com.stary.evo.runtime.dll";
+							public const string com_staryevo_tools_runtime_dll_bytes = "WebGL_com.staryevo.tools.runtime.dll";
+							public const string dotween_dll_bytes = "WebGL_DOTween.dll";
+							public const string hotupdate_main_dll_bytes = "WebGL_HotUpdate_Main.dll";
+							public const string hotupdate_main_pdb_bytes = "WebGL_HotUpdate_Main.pdb";
+							public const string mscorlib_dll_bytes = "WebGL_mscorlib.dll";
+							public const string system_core_dll_bytes = "WebGL_System.Core.dll";
+							public const string unitask_dll_bytes = "WebGL_UniTask.dll";
+							public const string unityengine_coremodule_dll_bytes = "WebGL_UnityEngine.CoreModule.dll";
+							public const string yooasset_dll_bytes = "WebGL_YooAsset.dll";
+					}
 			}
 			 public static class prefabs
 			{

Assets/Domain/Main/HotUpdate/ScenePanel.cs

@@ -2,7 +2,6 @@ using System;
 using System.Threading.Tasks;
 using DG.Tweening;
 using Stary.Evo;
-using Stary.Evo.RKTools;
 using Stary.Evo.UIFarme;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -13,6 +12,7 @@ namespace Main
 {
     public class ScenePanel : BasePanel, IBasePanel
     {
+        public override string UIPath => "/ScenePanel";
         public override UITweenType TweenType => UITweenType.Fade;
 
         private ArtScene[] _scenesNames;
@@ -70,7 +70,7 @@ namespace Main
                     viewBg.transform.Find("Text").GetComponent<Text>().text = _scenesNames[i].sceneName;
                     viewBg.name = _scenesNames[i].sceneName;
                     _sceneGrids[i] = viewBg;
-                    viewBg.gameObject.ObjectAddTouchEvent(OnTouchComplete);
+                    //viewBg.gameObject.ObjectAddTouchEvent(OnTouchComplete);
                 }
             }
         }
@@ -79,7 +79,7 @@ namespace Main
         {
             for (int i = 0; i < _sceneGrids.Length; i++)
             {
-                _sceneGrids[i].gameObject.ObjectPauseTouchEvent();
+                //_sceneGrids[i].gameObject.ObjectPauseTouchEvent();
             }
 
             ArtScene artScene = null;
@@ -117,7 +117,7 @@ namespace Main
             this.UnRegisterEvent<string, string>("SetSceneData", SetSceneData);
             for (int i = 0; i < _sceneGrids.Length; i++)
             {
-                _sceneGrids[i].gameObject.ObjectRemoveTouchEvent();
+                //_sceneGrids[i].gameObject.ObjectRemoveTouchEvent();
                 GameObject.Destroy(_sceneGrids[i].gameObject);
             }
 
@@ -134,7 +134,7 @@ namespace Main
                     this.canvasGroup.alpha = 1;
                     for (int i = 0; i < _sceneGrids.Length; i++)
                     {
-                        _sceneGrids[i].gameObject.ObjectResumeTouchEvent();
+                        //_sceneGrids[i].gameObject.ObjectResumeTouchEvent();
                     }
                 });
             StringEventSystem.Global.Send("X_ButtonHierarchyType",DeviceXEventHandler.HierarchyType.ScenePanel);