瀏覽代碼

修复exe启动报错的bug & 重打包exe

大爷 2 年之前
父節點
當前提交
c19891decf
共有 37 個文件被更改,包括 24 次插入845 次删除
  1. 二進制
      Release/ET_Data/Plugins/x86_64/lib_burst_generated.dll
  2. 0 0
      Release/ET_Data/ScriptingAssemblies.json
  3. 0 784
      Release/ET_Data/StreamingAssets/YooAssets/BuildReport_1.json
  4. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/OutputCache
  5. 0 37
      Release/ET_Data/StreamingAssets/YooAssets/OutputCache.manifest
  6. 0 0
      Release/ET_Data/StreamingAssets/YooAssets/PatchManifest_1.bytes
  7. 1 1
      Release/ET_Data/StreamingAssets/YooAssets/PatchManifest_1.hash
  8. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_animancer.dll_44d4884c385bfedc74ec3b1197bb91bf.rawfile
  9. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.dll_1f5777f301e4e7accfc4e6465f6646f6.rawfile
  10. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.dll_b49b5361d0f66f06ac0c9433ff49a2ec.rawfile
  11. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.pdb_20907622072facbac7fa4761c0c49ba3.rawfile
  12. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.pdb_a048ac58252ac8dc48a4b5ea407bc314.rawfile
  13. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_model.dll_0ff266d39d58b4ce6a78747c5fb63a55.rawfile
  14. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_model.dll_e94fb5748b3482a5594d2d8634d91d2e.rawfile
  15. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_model.pdb_7e0826b7af56b392512669583355b1d4.rawfile
  16. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_mscorlib.dll_24aecbf68cd2d4bf8fb7ffced903b442.rawfile
  17. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_unity.loader.dll_0dfe8f5b4b5c40ef4e9e97e5025894f9.rawfile
  18. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_unity.loader.dll_5ea10aedaf520a4f6fe243fd1e636370.rawfile
  19. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_unity.mono.dll_0fadbd6810bc627053a480c63d32bee3.rawfile
  20. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_config_ce370c80570aaaeff7294a59484f6b5a.bundle
  21. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_unit_d509121cfcc300e6885ce1e00492b2ec.bundle
  22. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_res_unit_skeleton_6d647bd47ea96fe0e50cfe644dcb76a7.bundle
  23. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/assets_scenes_37506f5f50f46e392f4f8ca2a54ed219.bundle
  24. 二進制
      Release/ET_Data/StreamingAssets/YooAssets/unityshaders_41cc1b1f4e43ac2c009b25630211395f.bundle
  25. 二進制
      Release/ET_Data/globalgamemanagers
  26. 二進制
      Release/ET_Data/globalgamemanagers.assets
  27. 二進制
      Release/ET_Data/il2cpp_data/Metadata/global-metadata.dat
  28. 二進制
      Release/ET_Data/level0
  29. 二進制
      Release/ET_Data/resources.assets
  30. 二進制
      Release/ET_Data/sharedassets0.assets
  31. 二進制
      Release/GameAssembly.dll
  32. 2 0
      Unity/Assets/HybridCLRData/Generated/link.xml
  33. 8 4
      Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Move/MoveHelper.cs
  34. 1 1
      Unity/Assets/Scripts/Codes/Mono/AnimationData.cs
  35. 3 3
      Unity/Assets/Scripts/Editor/BuildEditor/BuildAssembliesHelper.cs
  36. 4 11
      Unity/Assets/Scripts/Editor/BuildEditor/BuildEditor.cs
  37. 5 4
      Unity/Assets/Scripts/Loader/CodeLoader.cs

二進制
Release/ET_Data/Plugins/x86_64/lib_burst_generated.dll


文件差異過大導致無法顯示
+ 0 - 0
Release/ET_Data/ScriptingAssemblies.json


+ 0 - 784
Release/ET_Data/StreamingAssets/YooAssets/BuildReport_1.json

@@ -1,784 +0,0 @@
-{
-    "Summary": {
-        "YooVersion": "1.2.4",
-        "UnityVersion": "2021.3.15f1c1",
-        "BuildDate": "2023/2/8 15:19:38",
-        "BuildSeconds": 132,
-        "BuildTarget": 19,
-        "BuildPipeline": 0,
-        "BuildMode": 0,
-        "BuildVersion": 1,
-        "BuildinTags": "",
-        "EnableAddressable": true,
-        "CopyBuildinTagFiles": true,
-        "EncryptionServicesClassName": "null",
-        "OutputNameStyle": 4,
-        "CompressOption": 2,
-        "DisableWriteTypeTree": false,
-        "IgnoreTypeTreeChanges": true,
-        "AssetFileTotalCount": 86,
-        "MainAssetTotalCount": 43,
-        "AllBundleTotalCount": 27,
-        "AllBundleTotalSize": 19084928,
-        "BuildinBundleTotalCount": 27,
-        "BuildinBundleTotalSize": 19084928,
-        "EncryptedBundleTotalCount": 0,
-        "EncryptedBundleTotalSize": 0,
-        "RawBundleTotalCount": 18,
-        "RawBundleTotalSize": 6614909
-    },
-    "AssetInfos": [
-        {
-            "Address": "FairyGUI.Runtime.dll",
-            "AssetPath": "Assets/Res/CodeDll/FairyGUI.Runtime.dll.bytes",
-            "AssetGUID": "ef94bd85ca8ea5b4c83be5f1327f8f21",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_fairygui.runtime.dll.rawfile",
-            "MainBundleSize": 473088,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Hotfix.dll",
-            "AssetPath": "Assets/Res/CodeDll/Hotfix.dll.bytes",
-            "AssetGUID": "2a966c4388c6c474d97b34a53d2895db",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_hotfix.dll.rawfile",
-            "MainBundleSize": 84992,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Hotfix.pdb",
-            "AssetPath": "Assets/Res/CodeDll/Hotfix.pdb.bytes",
-            "AssetGUID": "214b672a789ed364b9e64c14428cf62f",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_hotfix.pdb.rawfile",
-            "MainBundleSize": 42440,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Model.dll",
-            "AssetPath": "Assets/Res/CodeDll/Model.dll.bytes",
-            "AssetGUID": "1f46dd4b37ca5e84e97c7a19d0fcab91",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_model.dll.rawfile",
-            "MainBundleSize": 69632,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Model.pdb",
-            "AssetPath": "Assets/Res/CodeDll/Model.pdb.bytes",
-            "AssetGUID": "aeaaf026efc5bc54eb8cdebbcd572ac4",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_model.pdb.rawfile",
-            "MainBundleSize": 42292,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "MongoDB.Bson.dll",
-            "AssetPath": "Assets/Res/CodeDll/MongoDB.Bson.dll.bytes",
-            "AssetGUID": "9f9ffbba64727e54182c21d9ebe1a261",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_mongodb.bson.dll.rawfile",
-            "MainBundleSize": 543744,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "mscorlib.dll",
-            "AssetPath": "Assets/Res/CodeDll/mscorlib.dll.bytes",
-            "AssetGUID": "f012e6eb1450d95459e0d2b4646cbe68",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_mscorlib.dll.rawfile",
-            "MainBundleSize": 2495488,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Sirenix.Serialization.dll",
-            "AssetPath": "Assets/Res/CodeDll/Sirenix.Serialization.dll.bytes",
-            "AssetGUID": "622053318aa7aef42a112fef4c4e4fda",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_sirenix.serialization.dll.rawfile",
-            "MainBundleSize": 345600,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "System.Core.dll",
-            "AssetPath": "Assets/Res/CodeDll/System.Core.dll.bytes",
-            "AssetGUID": "e7c3f8a0194a21e4d8dfdcea78af7fc8",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_system.core.dll.rawfile",
-            "MainBundleSize": 445952,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "System.dll",
-            "AssetPath": "Assets/Res/CodeDll/System.dll.bytes",
-            "AssetGUID": "f1d8f4271c7438b4d98d2020889867ba",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_system.dll.rawfile",
-            "MainBundleSize": 1135104,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "UniTask.dll",
-            "AssetPath": "Assets/Res/CodeDll/UniTask.dll.bytes",
-            "AssetGUID": "88fbcc65fb9220241826efe575594ce6",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_unitask.dll.rawfile",
-            "MainBundleSize": 486912,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "UniTask.YooAsset.dll",
-            "AssetPath": "Assets/Res/CodeDll/UniTask.YooAsset.dll.bytes",
-            "AssetGUID": "cba2398b2d45ba54da24260087a3c86e",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_unitask.yooasset.dll.rawfile",
-            "MainBundleSize": 7680,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Unity.Core.dll",
-            "AssetPath": "Assets/Res/CodeDll/Unity.Core.dll.bytes",
-            "AssetGUID": "a275f6fc44c6408458519b3ff3e00baf",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_unity.core.dll.rawfile",
-            "MainBundleSize": 123392,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Unity.Loader.dll",
-            "AssetPath": "Assets/Res/CodeDll/Unity.Loader.dll.bytes",
-            "AssetGUID": "3fa85412173b3f449a40be009a6825f1",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_unity.loader.dll.rawfile",
-            "MainBundleSize": 39424,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Unity.ThirdParty.dll",
-            "AssetPath": "Assets/Res/CodeDll/Unity.ThirdParty.dll.bytes",
-            "AssetGUID": "f6a4d10bacf80364f813c8384c66a25f",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_unity.thirdparty.dll.rawfile",
-            "MainBundleSize": 185344,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "YooAsset.dll",
-            "AssetPath": "Assets/Res/CodeDll/YooAsset.dll.bytes",
-            "AssetGUID": "ff23401f6914d344488df5a8257fd2ce",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_codedll_yooasset.dll.rawfile",
-            "MainBundleSize": 93696,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "HotUpdateAssemblyManifest",
-            "AssetPath": "Assets/Res/Config/HotUpdateAssemblyManifest.asset",
-            "AssetGUID": "4892b805f990ace47bb973cc3d26826b",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_config.bundle",
-            "MainBundleSize": 2003,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "AIConfigCategory",
-            "AssetPath": "Assets/Res/Config/GenFromExcel/AIConfigCategory.bytes",
-            "AssetGUID": "0ce8e5cdc2a99ea4f89d259ed7e4a60a",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_config_genfromexcel_aiconfigcategory.rawfile",
-            "MainBundleSize": 58,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "UnitConfigCategory",
-            "AssetPath": "Assets/Res/Config/GenFromExcel/UnitConfigCategory.bytes",
-            "AssetGUID": "87c7e5aaf7231aa4f93ac95e494e71f9",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_config_genfromexcel_unitconfigcategory.rawfile",
-            "MainBundleSize": 71,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Scene_Init",
-            "AssetPath": "Assets/Scenes/Init.unity",
-            "AssetGUID": "e0d691ac8c1d0454ba07089ea820e18a",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes.bundle",
-            "MainBundleSize": 2267411,
-            "DependBundles": [],
-            "DependAssets": [
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconWarning.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconError.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/SlicedBackground.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconInfo.psd",
-                "Assets/Plugins/IngameDebugConsole/Prefabs/CommandSuggestion.prefab",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconCollapse.psd",
-                "Assets/Plugins/IngameDebugConsole/Prefabs/DebugLogItem.prefab",
-                "Assets/Plugins/IngameDebugConsole/Sprites/SlicedBackground2.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconHide.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconResize.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/SlicedBackground3.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconSnapToBottom.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconClear.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/Unused/IconInfoHighRes.psd",
-                "Assets/Plugins/IngameDebugConsole/Sprites/SearchIcon.psd",
-                "Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab",
-                "Assets/Plugins/IngameDebugConsole/Sprites/IconSnapToBottomBg.psd"
-            ]
-        },
-        {
-            "Address": "Scene_Map1",
-            "AssetPath": "Assets/Scenes/Map1.unity",
-            "AssetGUID": "a5294483f20f40d449699101bb428cda",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes.bundle",
-            "MainBundleSize": 2267411,
-            "DependBundles": [
-                "assets_scenes_map1.bundle",
-                "assets_res_mat.bundle",
-                "unityshaders.bundle"
-            ],
-            "DependAssets": [
-                "Assets/Scenes/Map1/Lightmap-0_comp_light.exr",
-                "Assets/Scenes/Map1Settings.lighting",
-                "Assets/Res/Mat/Urp.mat",
-                "Assets/Scenes/Map1/ReflectionProbe-0.exr",
-                "Assets/Scenes/Map1/Lightmap-0_comp_dir.png",
-                "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader"
-            ]
-        },
-        {
-            "Address": "Scene_Map2",
-            "AssetPath": "Assets/Scenes/Map2.unity",
-            "AssetGUID": "064123f1e5067b249a9fd8967ddbde09",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes.bundle",
-            "MainBundleSize": 2267411,
-            "DependBundles": [
-                "assets_scenes_map2.bundle",
-                "assets_res_mat.bundle",
-                "unityshaders.bundle"
-            ],
-            "DependAssets": [
-                "Assets/Scenes/Map2Settings.lighting",
-                "Assets/Scenes/Map2/ReflectionProbe-0.exr",
-                "Assets/Res/Mat/Urp.mat",
-                "Assets/Scenes/Map2/Lightmap-0_comp_dir.png",
-                "Assets/Scenes/Map2/Lightmap-0_comp_light.exr",
-                "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader"
-            ]
-        },
-        {
-            "Address": "Map1_Lightmap-0_comp_dir",
-            "AssetPath": "Assets/Scenes/Map1/Lightmap-0_comp_dir.png",
-            "AssetGUID": "eeeb8730251ee1b469b9b070c7efb1cf",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes_map1.bundle",
-            "MainBundleSize": 1253358,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Map1_Lightmap-0_comp_light",
-            "AssetPath": "Assets/Scenes/Map1/Lightmap-0_comp_light.exr",
-            "AssetGUID": "ab3027117b6819848bae7b1746588d06",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes_map1.bundle",
-            "MainBundleSize": 1253358,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Map1_ReflectionProbe-0",
-            "AssetPath": "Assets/Scenes/Map1/ReflectionProbe-0.exr",
-            "AssetGUID": "02bc6af578f699249a101b704d189b5a",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes_map1.bundle",
-            "MainBundleSize": 1253358,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Map2_Lightmap-0_comp_dir",
-            "AssetPath": "Assets/Scenes/Map2/Lightmap-0_comp_dir.png",
-            "AssetGUID": "62a71c4ca03e7434ca6ff4bba65ffb45",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes_map2.bundle",
-            "MainBundleSize": 634883,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Map2_Lightmap-0_comp_light",
-            "AssetPath": "Assets/Scenes/Map2/Lightmap-0_comp_light.exr",
-            "AssetGUID": "0d7da8dd669b0d8488a81fcb41451b21",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes_map2.bundle",
-            "MainBundleSize": 634883,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Map2_ReflectionProbe-0",
-            "AssetPath": "Assets/Scenes/Map2/ReflectionProbe-0.exr",
-            "AssetGUID": "1f1694b2c0d992047b551ad028dd5347",
-            "AssetTags": [],
-            "MainBundleName": "assets_scenes_map2.bundle",
-            "MainBundleSize": 634883,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_HUD_atlas0",
-            "AssetPath": "Assets/Res/FGUI/HUD_atlas0.png",
-            "AssetGUID": "cc1b07c82963bd74aa75ef771ae82eb9",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_HUD_fui",
-            "AssetPath": "Assets/Res/FGUI/HUD_fui.bytes",
-            "AssetGUID": "988af65dcf7a46c40a8d8be58ffd2116",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_Loading_atlas0",
-            "AssetPath": "Assets/Res/FGUI/Loading_atlas0.png",
-            "AssetGUID": "f243152a47e81e04784f22325ec7bdc0",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_Loading_fui",
-            "AssetPath": "Assets/Res/FGUI/Loading_fui.bytes",
-            "AssetGUID": "b181557b635803a48af616795635b236",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_Lobby_atlas0",
-            "AssetPath": "Assets/Res/FGUI/Lobby_atlas0.png",
-            "AssetGUID": "b8c1223990b0bb047a2f81e07bfe63a2",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_Lobby_fui",
-            "AssetPath": "Assets/Res/FGUI/Lobby_fui.bytes",
-            "AssetGUID": "41b048a6581db7d4dbdbb554e668af17",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_Login_atlas0",
-            "AssetPath": "Assets/Res/FGUI/Login_atlas0.png",
-            "AssetGUID": "08e72e80e0c22054fa9d7fb698b1d64f",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "FGUI_Login_fui",
-            "AssetPath": "Assets/Res/FGUI/Login_fui.bytes",
-            "AssetGUID": "d3fa9ef7f0f45504594b06ebcb571e73",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_fgui.bundle",
-            "MainBundleSize": 1364028,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Shader_NewSurfaceShader",
-            "AssetPath": "Assets/Res/Shader/NewSurfaceShader.shader",
-            "AssetGUID": "a098bd7d5939c054982999a9523191df",
-            "AssetTags": [],
-            "MainBundleName": "unityshaders.bundle",
-            "MainBundleSize": 223469,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Shader_NewUnlitShader",
-            "AssetPath": "Assets/Res/Shader/NewUnlitShader.shader",
-            "AssetGUID": "718489c739fa0924eb3bc03cac3bb7a8",
-            "AssetTags": [],
-            "MainBundleName": "unityshaders.bundle",
-            "MainBundleSize": 223469,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Shader_ProjectSShaderVariant",
-            "AssetPath": "Assets/Res/Shader/ProjectSShaderVariant.shadervariants",
-            "AssetGUID": "54abdc6482fd89b4a95f4ec2edf62e05",
-            "AssetTags": [],
-            "MainBundleName": "unityshaders.bundle",
-            "MainBundleSize": 223469,
-            "DependBundles": [],
-            "DependAssets": [
-                "Assets/Res/Shader/NewUnlitShader.shader",
-                "Packages/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepth.shader",
-                "Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/LutBuilderLdr.shader",
-                "Packages/com.unity.render-pipelines.universal/Shaders/Unlit.shader",
-                "Packages/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader",
-                "Packages/com.unity.render-pipelines.universal/Shaders/PostProcessing/UberPost.shader",
-                "Packages/com.unity.render-pipelines.universal/Shaders/Utils/Blit.shader",
-                "Assets/Plugins/AstarPathfindingProject/Editor/EditorAssets/Materials/NavmeshOutline.shader",
-                "Assets/Plugins/AstarPathfindingProject/Editor/EditorAssets/Materials/Navmesh.shader",
-                "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader"
-            ]
-        },
-        {
-            "Address": "Shader_ProjectSShaderVariant_Readme",
-            "AssetPath": "Assets/Res/Shader/ProjectSShaderVariant_Readme.json",
-            "AssetGUID": "38836c7248abcf44492ac6d18222bfc7",
-            "AssetTags": [],
-            "MainBundleName": "unityshaders.bundle",
-            "MainBundleSize": 223469,
-            "DependBundles": [],
-            "DependAssets": []
-        },
-        {
-            "Address": "Urp",
-            "AssetPath": "Assets/Res/Mat/Urp.mat",
-            "AssetGUID": "6d5adfb995cb79c438d8b1e6b5e5de91",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_mat.bundle",
-            "MainBundleSize": 2900,
-            "DependBundles": [
-                "unityshaders.bundle"
-            ],
-            "DependAssets": [
-                "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader"
-            ]
-        },
-        {
-            "Address": "Unit_Aj",
-            "AssetPath": "Assets/Res/Unit/Aj.prefab",
-            "AssetGUID": "ad4c0d8eca02fe545912a5c081ce239b",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_unit.bundle",
-            "MainBundleSize": 5960830,
-            "DependBundles": [
-                "unityshaders.bundle"
-            ],
-            "DependAssets": [
-                "Assets/Res/Model/Aj/Material/Boy01_Body_MAT1.mat",
-                "Assets/Res/Model/Aj/Material/Boy01_Brows_MAT2.mat",
-                "Assets/Res/Model/Aj/Texture/Boy01_normal.jpg",
-                "Assets/Res/Model/Aj/Texture/Boy01_FacialAnimMap.png",
-                "Assets/Res/Model/Aj/Aj.fbx",
-                "Assets/Res/Model/Aj/Material/Boy01_Mouth_MAT2.mat",
-                "Assets/Res/Model/Aj/Material/Boy01_Eyes_MAT2.mat",
-                "Assets/Res/Model/Aj/Texture/Boy01_diffuse.jpg",
-                "Assets/Res/Model/Aj/Texture/Boy01_spec.jpg",
-                "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader"
-            ]
-        },
-        {
-            "Address": "Unit_Skeleton",
-            "AssetPath": "Assets/Res/Unit/Skeleton/Skeleton.prefab",
-            "AssetGUID": "9e27b0bdab1ad7242a009899d15c0e67",
-            "AssetTags": [],
-            "MainBundleName": "assets_res_unit_skeleton.bundle",
-            "MainBundleSize": 761137,
-            "DependBundles": [
-                "unityshaders.bundle"
-            ],
-            "DependAssets": [
-                "Assets/Res/Unit/Skeleton/SkeletonController.controller",
-                "Assets/Res/Unit/Skeleton/Texture/Skeleton_D.tif",
-                "Assets/Res/Unit/Skeleton/Ani/Skeleton@Idle.FBX",
-                "Assets/Res/Unit/Skeleton/Ani/Materials/skeleton_D.mat",
-                "Packages/com.unity.render-pipelines.universal/Shaders/SimpleLit.shader",
-                "Assets/Res/Unit/Skeleton/Ani/Skeleton@Run.FBX"
-            ]
-        }
-    ],
-    "BundleInfos": [
-        {
-            "BundleName": "assets_res_codedll_fairygui.runtime.dll.rawfile",
-            "FileName": "assets_res_codedll_fairygui.runtime.dll_800c9a2e8861d2d3b638af26821cc2d2.rawfile",
-            "FileHash": "800c9a2e8861d2d3b638af26821cc2d2",
-            "FileCRC": "ef406ed4",
-            "FileSize": 473088,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_hotfix.dll.rawfile",
-            "FileName": "assets_res_codedll_hotfix.dll_1f5777f301e4e7accfc4e6465f6646f6.rawfile",
-            "FileHash": "1f5777f301e4e7accfc4e6465f6646f6",
-            "FileCRC": "269f2d07",
-            "FileSize": 84992,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_hotfix.pdb.rawfile",
-            "FileName": "assets_res_codedll_hotfix.pdb_a048ac58252ac8dc48a4b5ea407bc314.rawfile",
-            "FileHash": "a048ac58252ac8dc48a4b5ea407bc314",
-            "FileCRC": "90b36674",
-            "FileSize": 42440,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_model.dll.rawfile",
-            "FileName": "assets_res_codedll_model.dll_0ff266d39d58b4ce6a78747c5fb63a55.rawfile",
-            "FileHash": "0ff266d39d58b4ce6a78747c5fb63a55",
-            "FileCRC": "d8498d9b",
-            "FileSize": 69632,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_model.pdb.rawfile",
-            "FileName": "assets_res_codedll_model.pdb_bb71481b0103ffc4bcafa99b556ab064.rawfile",
-            "FileHash": "bb71481b0103ffc4bcafa99b556ab064",
-            "FileCRC": "79ab4146",
-            "FileSize": 42292,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_mongodb.bson.dll.rawfile",
-            "FileName": "assets_res_codedll_mongodb.bson.dll_e0eab35b583feb318aa27fccb4774e85.rawfile",
-            "FileHash": "e0eab35b583feb318aa27fccb4774e85",
-            "FileCRC": "0b2bb7fb",
-            "FileSize": 543744,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_mscorlib.dll.rawfile",
-            "FileName": "assets_res_codedll_mscorlib.dll_2903712fd1a0475c507e71fddb389ed7.rawfile",
-            "FileHash": "2903712fd1a0475c507e71fddb389ed7",
-            "FileCRC": "2ce274de",
-            "FileSize": 2495488,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_sirenix.serialization.dll.rawfile",
-            "FileName": "assets_res_codedll_sirenix.serialization.dll_ad8dbca639552a28a40b8703a66d7275.rawfile",
-            "FileHash": "ad8dbca639552a28a40b8703a66d7275",
-            "FileCRC": "ee8a1526",
-            "FileSize": 345600,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_system.core.dll.rawfile",
-            "FileName": "assets_res_codedll_system.core.dll_55d944d2c13aaf8d90bc1096eca5ca4d.rawfile",
-            "FileHash": "55d944d2c13aaf8d90bc1096eca5ca4d",
-            "FileCRC": "72377c0d",
-            "FileSize": 445952,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_system.dll.rawfile",
-            "FileName": "assets_res_codedll_system.dll_e563ad519053f00d677ad15e6cf196e6.rawfile",
-            "FileHash": "e563ad519053f00d677ad15e6cf196e6",
-            "FileCRC": "c2b588dc",
-            "FileSize": 1135104,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_unitask.dll.rawfile",
-            "FileName": "assets_res_codedll_unitask.dll_f3f1b12140c0e1726119ed1d90fe34b0.rawfile",
-            "FileHash": "f3f1b12140c0e1726119ed1d90fe34b0",
-            "FileCRC": "f9e30d4b",
-            "FileSize": 486912,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_unitask.yooasset.dll.rawfile",
-            "FileName": "assets_res_codedll_unitask.yooasset.dll_f1757b80eac9eaf88f159dafc1099cd4.rawfile",
-            "FileHash": "f1757b80eac9eaf88f159dafc1099cd4",
-            "FileCRC": "caeee8b5",
-            "FileSize": 7680,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_unity.core.dll.rawfile",
-            "FileName": "assets_res_codedll_unity.core.dll_92e839cbabea68f9b9abc0be78391cde.rawfile",
-            "FileHash": "92e839cbabea68f9b9abc0be78391cde",
-            "FileCRC": "fa9ac11d",
-            "FileSize": 123392,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_unity.loader.dll.rawfile",
-            "FileName": "assets_res_codedll_unity.loader.dll_5ea10aedaf520a4f6fe243fd1e636370.rawfile",
-            "FileHash": "5ea10aedaf520a4f6fe243fd1e636370",
-            "FileCRC": "807acf64",
-            "FileSize": 39424,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_unity.thirdparty.dll.rawfile",
-            "FileName": "assets_res_codedll_unity.thirdparty.dll_e905a25cebed3f994c8030ef940f9ed5.rawfile",
-            "FileHash": "e905a25cebed3f994c8030ef940f9ed5",
-            "FileCRC": "ede0e9e7",
-            "FileSize": 185344,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_codedll_yooasset.dll.rawfile",
-            "FileName": "assets_res_codedll_yooasset.dll_f7ba27fad8cd01ba332afb1ab9f994a8.rawfile",
-            "FileHash": "f7ba27fad8cd01ba332afb1ab9f994a8",
-            "FileCRC": "e396c735",
-            "FileSize": 93696,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_config.bundle",
-            "FileName": "assets_res_config_49973c27720eebf28b68a249675ddd6e.bundle",
-            "FileHash": "49973c27720eebf28b68a249675ddd6e",
-            "FileCRC": "794df9cc",
-            "FileSize": 2003,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "assets_res_config_genfromexcel_aiconfigcategory.rawfile",
-            "FileName": "assets_res_config_genfromexcel_aiconfigcategory_dcc9af1a53287b85a06071cffa8b4dbd.rawfile",
-            "FileHash": "dcc9af1a53287b85a06071cffa8b4dbd",
-            "FileCRC": "cc3692f7",
-            "FileSize": 58,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_res_config_genfromexcel_unitconfigcategory.rawfile",
-            "FileName": "assets_res_config_genfromexcel_unitconfigcategory_51d386e351070cab78c899f7e8190b05.rawfile",
-            "FileHash": "51d386e351070cab78c899f7e8190b05",
-            "FileCRC": "e169d062",
-            "FileSize": 71,
-            "Tags": [],
-            "Flags": 6
-        },
-        {
-            "BundleName": "assets_scenes.bundle",
-            "FileName": "assets_scenes_a85c37663c57b860df2d32a2ccbef460.bundle",
-            "FileHash": "a85c37663c57b860df2d32a2ccbef460",
-            "FileCRC": "25fa3e7e",
-            "FileSize": 2267411,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "assets_scenes_map1.bundle",
-            "FileName": "assets_scenes_map1_e3af3f0d21dc879e4c4b5471c1c09d99.bundle",
-            "FileHash": "e3af3f0d21dc879e4c4b5471c1c09d99",
-            "FileCRC": "48ff5fae",
-            "FileSize": 1253358,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "assets_scenes_map2.bundle",
-            "FileName": "assets_scenes_map2_df610bdaad42186dcafbd4e62834e45b.bundle",
-            "FileHash": "df610bdaad42186dcafbd4e62834e45b",
-            "FileCRC": "bdcf90cf",
-            "FileSize": 634883,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "assets_res_fgui.bundle",
-            "FileName": "assets_res_fgui_8d7e962c305b7b902a7e318b0525a07b.bundle",
-            "FileHash": "8d7e962c305b7b902a7e318b0525a07b",
-            "FileCRC": "ea00be27",
-            "FileSize": 1364028,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "unityshaders.bundle",
-            "FileName": "unityshaders_66d3507b38086a31bb274369955f94df.bundle",
-            "FileHash": "66d3507b38086a31bb274369955f94df",
-            "FileCRC": "d6df5889",
-            "FileSize": 223469,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "assets_res_mat.bundle",
-            "FileName": "assets_res_mat_5a8e3d0545e6e880860cd268b58fc537.bundle",
-            "FileHash": "5a8e3d0545e6e880860cd268b58fc537",
-            "FileCRC": "bc97af3f",
-            "FileSize": 2900,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "assets_res_unit.bundle",
-            "FileName": "assets_res_unit_140c2d94fffc76b35911403b0da2f11d.bundle",
-            "FileHash": "140c2d94fffc76b35911403b0da2f11d",
-            "FileCRC": "f99a987e",
-            "FileSize": 5960830,
-            "Tags": [],
-            "Flags": 2
-        },
-        {
-            "BundleName": "assets_res_unit_skeleton.bundle",
-            "FileName": "assets_res_unit_skeleton_6d647bd47ea96fe0e50cfe644dcb76a7.bundle",
-            "FileHash": "6d647bd47ea96fe0e50cfe644dcb76a7",
-            "FileCRC": "c2ba395c",
-            "FileSize": 761137,
-            "Tags": [],
-            "Flags": 2
-        }
-    ]
-}

二進制
Release/ET_Data/StreamingAssets/YooAssets/OutputCache


+ 0 - 37
Release/ET_Data/StreamingAssets/YooAssets/OutputCache.manifest

@@ -1,37 +0,0 @@
-ManifestFileVersion: 0
-CRC: 1176320538
-AssetBundleManifest:
-  AssetBundleInfos:
-    Info_0:
-      Name: assets_res_config.bundle
-      Dependencies: {}
-    Info_1:
-      Name: assets_scenes.bundle
-      Dependencies:
-        Dependency_0: assets_scenes_map1.bundle
-        Dependency_1: assets_scenes_map2.bundle
-        Dependency_2: assets_res_mat.bundle
-    Info_2:
-      Name: assets_scenes_map1.bundle
-      Dependencies: {}
-    Info_3:
-      Name: assets_scenes_map2.bundle
-      Dependencies: {}
-    Info_4:
-      Name: assets_res_fgui.bundle
-      Dependencies: {}
-    Info_5:
-      Name: unityshaders.bundle
-      Dependencies: {}
-    Info_6:
-      Name: assets_res_mat.bundle
-      Dependencies:
-        Dependency_0: unityshaders.bundle
-    Info_7:
-      Name: assets_res_unit.bundle
-      Dependencies:
-        Dependency_0: unityshaders.bundle
-    Info_8:
-      Name: assets_res_unit_skeleton.bundle
-      Dependencies:
-        Dependency_0: unityshaders.bundle

文件差異過大導致無法顯示
+ 0 - 0
Release/ET_Data/StreamingAssets/YooAssets/PatchManifest_1.bytes


+ 1 - 1
Release/ET_Data/StreamingAssets/YooAssets/PatchManifest_1.hash

@@ -1 +1 @@
-4f837323f799607ab478abae413b047e
+16f8fef0306a8ca14cca840d6970a6c3

二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_animancer.dll_44d4884c385bfedc74ec3b1197bb91bf.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.dll_1f5777f301e4e7accfc4e6465f6646f6.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.dll_b49b5361d0f66f06ac0c9433ff49a2ec.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.pdb_20907622072facbac7fa4761c0c49ba3.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_hotfix.pdb_a048ac58252ac8dc48a4b5ea407bc314.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_model.dll_0ff266d39d58b4ce6a78747c5fb63a55.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_model.dll_e94fb5748b3482a5594d2d8634d91d2e.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_model.pdb_bb71481b0103ffc4bcafa99b556ab064.rawfile → Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_model.pdb_7e0826b7af56b392512669583355b1d4.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_mscorlib.dll_2903712fd1a0475c507e71fddb389ed7.rawfile → Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_mscorlib.dll_24aecbf68cd2d4bf8fb7ffced903b442.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_unity.loader.dll_0dfe8f5b4b5c40ef4e9e97e5025894f9.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_unity.loader.dll_5ea10aedaf520a4f6fe243fd1e636370.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_codedll_unity.mono.dll_0fadbd6810bc627053a480c63d32bee3.rawfile


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_config_49973c27720eebf28b68a249675ddd6e.bundle → Release/ET_Data/StreamingAssets/YooAssets/assets_res_config_ce370c80570aaaeff7294a59484f6b5a.bundle


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_unit_140c2d94fffc76b35911403b0da2f11d.bundle → Release/ET_Data/StreamingAssets/YooAssets/assets_res_unit_d509121cfcc300e6885ce1e00492b2ec.bundle


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_res_unit_skeleton_6d647bd47ea96fe0e50cfe644dcb76a7.bundle


二進制
Release/ET_Data/StreamingAssets/YooAssets/assets_scenes_a85c37663c57b860df2d32a2ccbef460.bundle → Release/ET_Data/StreamingAssets/YooAssets/assets_scenes_37506f5f50f46e392f4f8ca2a54ed219.bundle


二進制
Release/ET_Data/StreamingAssets/YooAssets/unityshaders_66d3507b38086a31bb274369955f94df.bundle → Release/ET_Data/StreamingAssets/YooAssets/unityshaders_41cc1b1f4e43ac2c009b25630211395f.bundle


二進制
Release/ET_Data/globalgamemanagers


二進制
Release/ET_Data/globalgamemanagers.assets


二進制
Release/ET_Data/il2cpp_data/Metadata/global-metadata.dat


二進制
Release/ET_Data/level0


二進制
Release/ET_Data/resources.assets


二進制
Release/ET_Data/sharedassets0.assets


二進制
Release/GameAssembly.dll


+ 2 - 0
Unity/Assets/HybridCLRData/Generated/link.xml

@@ -2,6 +2,8 @@
 <linker>
   <assembly fullname="Animancer">
     <type fullname="Animancer.AnimancerComponent" preserve="all" />
+    <type fullname="Animancer.AnimancerEvent" preserve="all" />
+    <type fullname="Animancer.AnimancerEvent/Sequence" preserve="all" />
     <type fullname="Animancer.AnimancerState" preserve="all" />
     <type fullname="Animancer.ClipTransition" preserve="all" />
     <type fullname="Animancer.DirectionalAnimationSet" preserve="all" />

+ 8 - 4
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Map/Move/MoveHelper.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Unity.Mathematics;
 
 namespace ET.Server
@@ -41,8 +41,12 @@ namespace ET.Server
 
         public static void Stop(this Unit unit, int error)
         {
-            unit.GetComponent<MoveComponent>().Stop(error == 0);
-            unit.SendStop(error);
+            var comp = unit.GetComponent<MoveComponent>();
+            if(!comp.IsArrived())
+            {
+                comp.Stop(error == 0);
+                unit.SendStop(error);
+            }
         }
 
         // error: 0表示协程走完正常停止
@@ -57,4 +61,4 @@ namespace ET.Server
             });
         }
     }
-}
+}

+ 1 - 1
Unity/Assets/Scripts/Codes/Mono/AnimationData.cs

@@ -19,7 +19,7 @@ namespace Mono
             Skill3
         }
 
-        [System.Serializable]
+        [Serializable]
         public struct AniInfo
         {
             public AnimationType Type;

+ 3 - 3
Unity/Assets/Scripts/Editor/BuildEditor/BuildAssembliesHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -136,7 +136,7 @@ namespace ET
             Debug.Log("copy Hotfix.dll to Assets/Res/CodeDll success!");
         }
 
-        private static void BuildMuteAssembly(
+        public static void BuildMuteAssembly(
             string assemblyName, List<string> CodeDirectorys,
             string[] additionalReferences, CodeOptimization codeOptimization, CodeMode codeMode = CodeMode.Client)
         {
@@ -251,4 +251,4 @@ namespace ET
             }
         }
     }
-}
+}

+ 4 - 11
Unity/Assets/Scripts/Editor/BuildEditor/BuildEditor.cs

@@ -229,16 +229,6 @@ namespace ET
             {
                 File.Copy(dll, Path.Combine(SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target), "Hotfix.dll"), true);
             }
-
-            dll = Path.Combine("./Library/ScriptAssemblies", "Unity.Mono.dll.bytes");
-            if (!File.Exists(dll))
-            {
-                Debug.LogError($"not exists: {dll}");
-            }
-            else
-            {
-                File.Copy(dll, Path.Combine(SettingsUtil.GetHotUpdateDllsOutputDirByTarget(target), "Unity.Mono.dll"), true);
-            }
         }
 
         public static void BuildModelAndHotfix(CodeOptimization codeOptimization = CodeOptimization.Release)
@@ -255,7 +245,10 @@ namespace ET
             BuildAssembliesHelper.BuildModel(codeOptimization, globalConfig);
             BuildAssembliesHelper.BuildHotfix(codeOptimization, globalConfig);
 
-            File.Copy(Path.Combine("./Library/ScriptAssemblies", "Unity.Mono.dll"), Path.Combine(YooAssetCodeDll, $"Unity.Mono.dll.bytes"), true);
+            BuildAssembliesHelper.BuildMuteAssembly("Unity.Mono", new List<string>() { "Assets/Scripts/Codes/Mono/" }, Array.Empty<string>(), codeOptimization, globalConfig.CodeMode);
+            File.Copy(Path.Combine(Define.BuildOutputDir, "Unity.Mono.dll"), Path.Combine(YooAssetCodeDll, $"Unity.Mono.dll.bytes"), true);
+            //File.Copy(Path.Combine(Define.BuildOutputDir, $"{logicFile}.pdb"), Path.Combine(CodeDir, $"Model.pdb.bytes"), true);
+            Debug.Log("copy Unity.Mono.dll to Assets/Res/CodeDll success!");
         }
 
         //将model.dll打包成ab

+ 5 - 4
Unity/Assets/Scripts/Loader/CodeLoader.cs

@@ -86,18 +86,19 @@ namespace ET
         //热更加载 model.dll & hotfix.dll
         private async UniTask LoadHotfixCode()
         {
-            Log.Info("to load model.dll & hotfix.dll.");
+            var mdll = await YooAssetProxy.GetRawFileAsync("Unity.Mono.dll");
+            var mAssembly = Assembly.Load(mdll.GetRawBytes());
+            Log.Info("loaded unity.mono.");
 
             var rawfile_modeldll = await YooAssetProxy.GetRawFileAsync("Model.dll");
             var rawfile_modelpdb = await YooAssetProxy.GetRawFileAsync("Model.pdb");
             var modelAssembly = Assembly.Load(rawfile_modeldll.GetRawBytes(), rawfile_modelpdb.GetRawBytes());
+            Log.Info("loaded model.");
 
             var rawfile_hotfixdll = await YooAssetProxy.GetRawFileAsync("Hotfix.dll");
             var rawfile_hotfixpdb = await YooAssetProxy.GetRawFileAsync("Hotfix.pdb");
             var hotfixAssembly = Assembly.Load(rawfile_hotfixdll.GetRawBytes(), rawfile_hotfixpdb.GetRawBytes());
-
-            var mdll = await YooAssetProxy.GetRawFileAsync("Unity.Mono.dll");
-            var mAssembly = Assembly.Load(mdll.GetRawBytes());
+            Log.Info("loaded hotfix.");
 
             Dictionary<string, Type> types = AssemblyHelper.GetAssemblyTypes(typeof(Game).Assembly, typeof(Init).Assembly, modelAssembly, hotfixAssembly, mAssembly);
             EventSystem.Instance.Add(types);

部分文件因文件數量過多而無法顯示