diff --git a/Assets/AssetBundleCollectorSetting.asset b/Assets/AssetBundleCollectorSetting.asset index 9a19ceb..5b77453 100644 --- a/Assets/AssetBundleCollectorSetting.asset +++ b/Assets/AssetBundleCollectorSetting.asset @@ -9,13 +9,240 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 74c3b5ecadf2b33419b6c21f51df9252, type: 3} + m_Script: {fileID: 11500000, guid: 185f6993d5150494d98da50e26cb1c25, type: 3} m_Name: AssetBundleCollectorSetting m_EditorClassIdentifier: ShowPackageView: 1 ShowEditorAlias: 0 UniqueBundleName: 1 Packages: + - PackageName: Test2_RawFile + PackageDesc: + EnableAddressable: 1 + SupportExtensionless: 1 + LocationToLower: 0 + IncludeAssetGUID: 1 + AutoCollectShaders: 1 + IgnoreRuleName: NormalIgnoreRule + Groups: + - GroupName: Video + GroupDesc: + AssetTags: Video + ActiveRuleName: EnableGroup + Collectors: [] + - PackageName: Test2 + PackageDesc: + EnableAddressable: 1 + SupportExtensionless: 1 + LocationToLower: 0 + IncludeAssetGUID: 1 + AutoCollectShaders: 1 + IgnoreRuleName: NormalIgnoreRule + Groups: + - GroupName: Config + GroupDesc: + AssetTags: Config + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test2/AddressableRes/Config/DomainConfig.asset + CollectorGUID: d54687dab9e02d34ba7557d70e717857 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Config + UserData: + - GroupName: Dll + GroupDesc: + AssetTags: Dll + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/com.stary.evo.runtime.dll.bytes + CollectorGUID: 5866e49199b6fbf4cb147551fbb276ab + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/com.staryevo.tools.runtime.dll.bytes + CollectorGUID: de684689658d29648972a284deeb6bd9 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/DOTween.dll.bytes + CollectorGUID: e93c66332ba696445abec25c819fee91 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/HotUpdate_Test2.dll.bytes + CollectorGUID: 265546bf5cb8d724ab7b3168dbdeac76 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/HotUpdate_Test2.pdb.bytes + CollectorGUID: cc98a9a07820e134aa4d39c0212516cb + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/mscorlib.dll.bytes + CollectorGUID: d96de580324684c41a187dd0099375c6 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/System.Core.dll.bytes + CollectorGUID: 5dbb1208169cdf445993d348eb7836f5 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/UniTask.dll.bytes + CollectorGUID: c25f72ca4a420654198d4cf405a9e310 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/UnityEngine.CoreModule.dll.bytes + CollectorGUID: 321ad47f398513947a2c375b39729895 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/Android/YooAsset.dll.bytes + CollectorGUID: e4c380eebd0071042ade05a19017ab32 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes + CollectorGUID: 83a200c10eb8d604397f3fcfb954140b + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes + CollectorGUID: 3efe46fcf7c9dd341a25ccf70d87458b + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/DOTween.dll.bytes + CollectorGUID: 4f51dacd4c44eb04ca17421b835f9cb4 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/HotUpdate_Test2.dll.bytes + CollectorGUID: 036ffd5b4a7471145afd24faddb781bc + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/HotUpdate_Test2.pdb.bytes + CollectorGUID: 250348df99b0d084d83ce14d35d775b9 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/mscorlib.dll.bytes + CollectorGUID: 4da5a45bf49ac144492184973fc85a35 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/System.Core.dll.bytes + CollectorGUID: 81917ec0d357046488fbcfc9459073e9 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/UniTask.dll.bytes + CollectorGUID: e531d5f3785ef53418897ce796e9b470 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes + CollectorGUID: 2334975c234f57a4493d379d2a17f36f + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test2/AddressableRes/Dll/WebGL/YooAsset.dll.bytes + CollectorGUID: 02fa3eaa2533db44f9d77755b5e79c5a + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - GroupName: Prefabs + GroupDesc: + AssetTags: Prefabs + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test2/AddressableRes/Prefabs/Test2.prefab + CollectorGUID: 00316e2b06bc537439b21bd077e9f22c + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Prefabs + UserData: + - GroupName: ShaderVariants_Test2 + GroupDesc: + AssetTags: + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test2/ShaderVariants/Test2.shadervariants + CollectorGUID: 085793bcf058e3545a81a7f13529d770 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackShaderVariants + FilterRuleName: CollectShaderVariants + AssetTags: ShaderVariants_Test2 + UserData: - PackageName: Main PackageDesc: EnableAddressable: 1 @@ -123,60 +350,85 @@ MonoBehaviour: FilterRuleName: CollectAll AssetTags: Dll UserData: - - GroupName: Font - GroupDesc: - AssetTags: Font - ActiveRuleName: EnableGroup - Collectors: - - CollectPath: Assets/Domain/Main/AddressableRes/Font/Arial Unicode MS SDF.asset - CollectorGUID: 93a04de572d63ab44a1e1dc9aa0f8c40 + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes + CollectorGUID: c225114d6adba4c4ab2628af2bf1265a CollectorType: 0 AddressRuleName: AddressByFolderAndFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: Font + AssetTags: Dll UserData: - - CollectPath: Assets/Domain/Main/AddressableRes/Font/Arial Unicode MS.ttf - CollectorGUID: 79170c9d2f097f4429a704c03e2948ad + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes + CollectorGUID: e24a0a82585670f4caffc545d4ac1588 CollectorType: 0 AddressRuleName: AddressByFolderAndFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: Font + AssetTags: Dll UserData: - - CollectPath: Assets/Domain/Main/AddressableRes/Font/SweiGothicLegCJKsc-DemiLight - Blue.asset - CollectorGUID: 14d76dd0bd95e2f46a702cc0856cce00 + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes + CollectorGUID: 6994074d165fc5347a314dea318307db CollectorType: 0 AddressRuleName: AddressByFolderAndFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: Font + AssetTags: Dll UserData: - - CollectPath: Assets/Domain/Main/AddressableRes/Font/SweiGothicLegCJKsc-DemiLight - SDF.asset - CollectorGUID: 923edb52d9f1a4844b344b13cbb166a8 + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes + CollectorGUID: 425880c9db860cd4db22b37e72aae351 CollectorType: 0 AddressRuleName: AddressByFolderAndFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: Font + AssetTags: Dll UserData: - - CollectPath: Assets/Domain/Main/AddressableRes/Font/SweiGothicLegCJKsc-DemiLight.ttf - CollectorGUID: bcdb82a9ba18c0a429a94630e5725c76 + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes + CollectorGUID: 2a78bd872d7d72d47bae8a2144dee88e CollectorType: 0 AddressRuleName: AddressByFolderAndFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: Font + AssetTags: Dll UserData: - - CollectPath: Assets/Domain/Main/AddressableRes/Font/SweiGothicLegCJKsc-Medium.ttf - CollectorGUID: 31e9c7d8dd4525441adfd95ccc5bab15 + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes + CollectorGUID: f707e91e063ddf24faa37eb365c2a465 CollectorType: 0 AddressRuleName: AddressByFolderAndFileName PackRuleName: PackDirectory FilterRuleName: CollectAll - AssetTags: Font + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes + CollectorGUID: feb34dd2fa0b55a489044a42de66e12e + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes + CollectorGUID: cd4ef6b4eadfeaa4a9e6d3675609a227 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes + CollectorGUID: 09db289a236e48e4e85db0dc6571f0eb + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes + CollectorGUID: def98fe25f17433428077fa3d8e49995 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll UserData: - GroupName: Prefabs GroupDesc: @@ -215,3 +467,270 @@ MonoBehaviour: FilterRuleName: CollectAll AssetTags: Prefabs UserData: + - GroupName: Sprites + GroupDesc: + AssetTags: Sprites + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Main/AddressableRes/Sprites/bg.png + CollectorGUID: 319a9f18c2b02da45a37686d885e102c + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Sprites + UserData: + - GroupName: ShaderVariants_Main + GroupDesc: + AssetTags: + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Main/ShaderVariants/Main.shadervariants + CollectorGUID: 4daba591399909847a85d95a271c2c19 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackShaderVariants + FilterRuleName: CollectShaderVariants + AssetTags: ShaderVariants_Main + UserData: + - PackageName: Main_RawFile + PackageDesc: + EnableAddressable: 1 + SupportExtensionless: 1 + LocationToLower: 0 + IncludeAssetGUID: 1 + AutoCollectShaders: 1 + IgnoreRuleName: NormalIgnoreRule + Groups: + - GroupName: Video + GroupDesc: + AssetTags: Video + ActiveRuleName: EnableGroup + Collectors: [] + - PackageName: Test1 + PackageDesc: + EnableAddressable: 1 + SupportExtensionless: 1 + LocationToLower: 0 + IncludeAssetGUID: 1 + AutoCollectShaders: 1 + IgnoreRuleName: NormalIgnoreRule + Groups: + - GroupName: Config + GroupDesc: + AssetTags: Config + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test1/AddressableRes/Config/DomainConfig.asset + CollectorGUID: b5f8cdc7a29d03546bd6ed19cc4af40e + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Config + UserData: + - GroupName: Dll + GroupDesc: + AssetTags: Dll + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/com.stary.evo.runtime.dll.bytes + CollectorGUID: a4f7781f14ed89142b2e3e46f7f896be + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/com.staryevo.tools.runtime.dll.bytes + CollectorGUID: d01d37f7220db914a86ffce160f94e0d + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/DOTween.dll.bytes + CollectorGUID: f564c24221103d740bff99f941a6a9f6 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/HotUpdate_Test1.dll.bytes + CollectorGUID: e8479009023df6046b23c199b52e43c4 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/HotUpdate_Test1.pdb.bytes + CollectorGUID: 7d36672058d9edc4899a3ab07a868b5e + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/mscorlib.dll.bytes + CollectorGUID: b564c90c91975fd42ba5cb1e7f693946 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/System.Core.dll.bytes + CollectorGUID: c74f218a22902b14f9eede21bdc9d6f9 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/UniTask.dll.bytes + CollectorGUID: 3e047bca596c0a043b2787c6f4aa58c9 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/UnityEngine.CoreModule.dll.bytes + CollectorGUID: 093b518c9e1ae774db9af339cbd61cac + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/Android/YooAsset.dll.bytes + CollectorGUID: 882b6970888775049b0bdd71e9e841f9 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes + CollectorGUID: df860045b526c9441804753df28037aa + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes + CollectorGUID: ef75dc844c835164c8948a499905884e + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/DOTween.dll.bytes + CollectorGUID: 635fa69ee54211040a7b3fb5c22f556b + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/HotUpdate_Test1.dll.bytes + CollectorGUID: aaa6f3690c9e08948bd82105d8c7db88 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/HotUpdate_Test1.pdb.bytes + CollectorGUID: eff70b80eb7589b4faa31bb03a00403a + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/mscorlib.dll.bytes + CollectorGUID: f6b696fab372d1341989ead5774f1479 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/System.Core.dll.bytes + CollectorGUID: 79e808d0203a2a848bacca05da8b03c4 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/UniTask.dll.bytes + CollectorGUID: c3aff1e6709054041a2f18f9c468794e + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes + CollectorGUID: 0fe60f9cb1495ce418f918ff04dc7bba + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - CollectPath: Assets/Domain/Test1/AddressableRes/Dll/WebGL/YooAsset.dll.bytes + CollectorGUID: e86f67a2caa88424e8f417e56efcd4b7 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Dll + UserData: + - GroupName: Prefabs + GroupDesc: + AssetTags: Prefabs + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test1/AddressableRes/Prefabs/Test1.prefab + CollectorGUID: 484ade3e09e6187479797e251fd9c973 + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: Prefabs + UserData: + - GroupName: ShaderVariants_Test1 + GroupDesc: + AssetTags: + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Domain/Test1/ShaderVariants/Test1.shadervariants + CollectorGUID: 73b7315eed89afa41a4266b2b6060bfe + CollectorType: 0 + AddressRuleName: AddressByFolderAndFileName + PackRuleName: PackShaderVariants + FilterRuleName: CollectShaderVariants + AssetTags: ShaderVariants_Test1 + UserData: + - PackageName: Test1_RawFile + PackageDesc: + EnableAddressable: 1 + SupportExtensionless: 1 + LocationToLower: 0 + IncludeAssetGUID: 1 + AutoCollectShaders: 1 + IgnoreRuleName: NormalIgnoreRule + Groups: + - GroupName: Video + GroupDesc: + AssetTags: Video + ActiveRuleName: EnableGroup + Collectors: [] diff --git a/Assets/Domain/Main/AddressableRes/Config/DomainConfig.asset b/Assets/Domain/Main/AddressableRes/Config/DomainConfig.asset index a30f71d..0e30a3d 100644 --- a/Assets/Domain/Main/AddressableRes/Config/DomainConfig.asset +++ b/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: diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.dll.bytes index 1937ba3..4b39457 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.pdb.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.pdb.bytes index 4b647ea..2e8a966 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.pdb.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.pdb.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/System.Core.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/System.Core.dll.bytes index 0280e71..a01e513 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/System.Core.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/System.Core.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/UniTask.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/UniTask.dll.bytes index 1a62fb3..df60241 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/UniTask.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/UniTask.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/UnityEngine.CoreModule.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/UnityEngine.CoreModule.dll.bytes index 0a7a341..84ea2b0 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/UnityEngine.CoreModule.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/UnityEngine.CoreModule.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/YooAsset.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/YooAsset.dll.bytes index e02785c..943a43a 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/YooAsset.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/YooAsset.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/com.stary.evo.runtime.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/com.stary.evo.runtime.dll.bytes index a121af0..be6bf7e 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/com.stary.evo.runtime.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/com.stary.evo.runtime.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/com.staryevo.tools.runtime.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/com.staryevo.tools.runtime.dll.bytes index 9fb4e33..ac88d51 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/com.staryevo.tools.runtime.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/com.staryevo.tools.runtime.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/Android/mscorlib.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/Android/mscorlib.dll.bytes index 771ef74..2423545 100644 Binary files a/Assets/Domain/Main/AddressableRes/Dll/Android/mscorlib.dll.bytes and b/Assets/Domain/Main/AddressableRes/Dll/Android/mscorlib.dll.bytes differ diff --git a/Assets/HybridCLRGenerate.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL.meta similarity index 77% rename from Assets/HybridCLRGenerate.meta rename to Assets/Domain/Main/AddressableRes/Dll/WebGL.meta index 7cb7ec7..90c8215 100644 --- a/Assets/HybridCLRGenerate.meta +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d738f2581db6a418196d379f8c499ed6 +guid: 6a3b60e19e68b024bb73a8afd583de26 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes new file mode 100644 index 0000000..6201111 Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes differ diff --git a/Assets/HybridCLRGenerate/link.xml.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes.meta similarity index 75% rename from Assets/HybridCLRGenerate/link.xml.meta rename to Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes.meta index 5deb5c7..8b09a50 100644 --- a/Assets/HybridCLRGenerate/link.xml.meta +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/DOTween.dll.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f762720f8d6da34ebed29a6ce714e9a +guid: 6994074d165fc5347a314dea318307db TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes new file mode 100644 index 0000000..6dc72cb Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes.meta new file mode 100644 index 0000000..2871636 --- /dev/null +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 425880c9db860cd4db22b37e72aae351 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes new file mode 100644 index 0000000..1c20c52 Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes.meta new file mode 100644 index 0000000..d32f465 --- /dev/null +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/HotUpdate_Main.pdb.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2a78bd872d7d72d47bae8a2144dee88e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes new file mode 100644 index 0000000..a01e513 Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes.meta new file mode 100644 index 0000000..d828f7b --- /dev/null +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/System.Core.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: feb34dd2fa0b55a489044a42de66e12e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes new file mode 100644 index 0000000..3c74d4a Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes.meta new file mode 100644 index 0000000..abee5ad --- /dev/null +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UniTask.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd4ef6b4eadfeaa4a9e6d3675609a227 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes new file mode 100644 index 0000000..a81a5d7 Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes.meta new file mode 100644 index 0000000..e25fc51 --- /dev/null +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/UnityEngine.CoreModule.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 09db289a236e48e4e85db0dc6571f0eb +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes new file mode 100644 index 0000000..5be9a97 Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes.meta new file mode 100644 index 0000000..8296d3f --- /dev/null +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/YooAsset.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: def98fe25f17433428077fa3d8e49995 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes new file mode 100644 index 0000000..63b6751 Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.stary.evo.runtime.dll.bytes.meta new file mode 100644 index 0000000..619ca8c --- /dev/null +++ b/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: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes new file mode 100644 index 0000000..933758b Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/com.staryevo.tools.runtime.dll.bytes.meta new file mode 100644 index 0000000..e1a644d --- /dev/null +++ b/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: diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes b/Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes new file mode 100644 index 0000000..cb37e5b Binary files /dev/null and b/Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes differ diff --git a/Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes.meta b/Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes.meta new file mode 100644 index 0000000..6fb0560 --- /dev/null +++ b/Assets/Domain/Main/AddressableRes/Dll/WebGL/mscorlib.dll.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f707e91e063ddf24faa37eb365c2a465 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Domain/Main/AddressableRes/Prefabs/Main.prefab b/Assets/Domain/Main/AddressableRes/Prefabs/Main.prefab index 2a1d6a1..7b262d1 100644 --- a/Assets/Domain/Main/AddressableRes/Prefabs/Main.prefab +++ b/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 diff --git a/Assets/Domain/Main/Conf/BuildAssetDataSetting.asset b/Assets/Domain/Main/Conf/BuildAssetDataSetting.asset index 46cdad0..6ed963b 100644 --- a/Assets/Domain/Main/Conf/BuildAssetDataSetting.asset +++ b/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 diff --git a/Assets/Domain/Main/HotUpdate/DomainPanel.cs b/Assets/Domain/Main/HotUpdate/DomainPanel.cs index 05b821e..dcabd22 100644 --- a/Assets/Domain/Main/HotUpdate/DomainPanel.cs +++ b/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() - .PushStack(packageName: "Main", parent: panelParent.transform); + .PushStack(packageName: "Main"); this.GetSystem().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); diff --git a/Assets/Domain/Main/HotUpdate/HotUpdate_Main.asmdef b/Assets/Domain/Main/HotUpdate/HotUpdate_Main.asmdef index 067288b..9f0a62d 100644 --- a/Assets/Domain/Main/HotUpdate/HotUpdate_Main.asmdef +++ b/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": [], diff --git a/Assets/Domain/Main/HotUpdate/MainDomain.cs b/Assets/Domain/Main/HotUpdate/MainDomain.cs index 811183d..c91ec72 100644 --- a/Assets/Domain/Main/HotUpdate/MainDomain.cs +++ b/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().PushStack(parent: this.transform); + await this.GetSystem().PushStack(); StringEventSystem.Global.Register("Rollback", OnRollback); } @@ -54,7 +56,7 @@ namespace Main { //注册示例 //RegisterSystem(new ScoreSystem()); - RegisterSystem(new PanelSystem()); + RegisterSystem(new PanelSystem(new YooAssetLoader())); } } } \ No newline at end of file diff --git a/Assets/Domain/Main/HotUpdate/Res.cs b/Assets/Domain/Main/HotUpdate/Res.cs index 6aa24fa..0a60d4c 100644 --- a/Assets/Domain/Main/HotUpdate/Res.cs +++ b/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 { diff --git a/Assets/Domain/Main/HotUpdate/ScenePanel.cs b/Assets/Domain/Main/HotUpdate/ScenePanel.cs index a72d731..7239d94 100644 --- a/Assets/Domain/Main/HotUpdate/ScenePanel.cs +++ b/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 = _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("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); diff --git a/Assets/HybridCLRGenerate/AOTGenericReferences.cs b/Assets/HybridCLRGenerate/AOTGenericReferences.cs deleted file mode 100644 index 3b4549c..0000000 --- a/Assets/HybridCLRGenerate/AOTGenericReferences.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.Collections.Generic; -public class AOTGenericReferences : UnityEngine.MonoBehaviour -{ - - // {{ AOT assemblies - public static readonly IReadOnlyList PatchedAOTAssemblyList = new List - { - "DOTween.dll", - "UnityEngine.CoreModule.dll", - "YooAsset.dll", - "com.stary.evo.runtime.dll", - "com.staryevo.tools.runtime.dll", - "mscorlib.dll", - }; - // }} - - // {{ constraint implement type - // }} - - // {{ AOT generic types - // Stary.Evo.Architecture.<>c - // Stary.Evo.Architecture - // Stary.Evo.EasyEvent.<>c - // Stary.Evo.EasyEvent.<>c__DisplayClass1_0 - // Stary.Evo.EasyEvent - // System.Action - // System.Action - // System.Action - // System.Collections.Generic.ArraySortHelper - // System.Collections.Generic.Comparer - // System.Collections.Generic.Dictionary.Enumerator - // System.Collections.Generic.Dictionary.KeyCollection.Enumerator - // System.Collections.Generic.Dictionary.KeyCollection - // System.Collections.Generic.Dictionary.ValueCollection.Enumerator - // System.Collections.Generic.Dictionary.ValueCollection - // System.Collections.Generic.Dictionary - // System.Collections.Generic.EqualityComparer - // System.Collections.Generic.ICollection - // System.Collections.Generic.IComparer - // System.Collections.Generic.IEnumerable> - // System.Collections.Generic.IEnumerable - // System.Collections.Generic.IEnumerator - // System.Collections.Generic.IEqualityComparer - // System.Collections.Generic.IList - // System.Collections.Generic.KeyValuePair - // System.Collections.Generic.List.Enumerator - // System.Collections.Generic.List - // System.Collections.Generic.ObjectComparer - // System.Collections.Generic.ObjectEqualityComparer - // System.Collections.ObjectModel.ReadOnlyCollection - // System.Comparison - // System.Func - // System.Func - // System.Func - // System.Func - // System.Func - // System.Predicate - // System.Runtime.CompilerServices.AsyncTaskMethodBuilder - // System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter - // System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter - // System.Runtime.CompilerServices.ConfiguredTaskAwaitable - // System.Runtime.CompilerServices.ConfiguredTaskAwaitable - // System.Runtime.CompilerServices.TaskAwaiter - // System.Runtime.CompilerServices.TaskAwaiter - // System.Threading.Tasks.ContinuationTaskFromResultTask - // System.Threading.Tasks.ContinuationTaskFromResultTask - // System.Threading.Tasks.Task - // System.Threading.Tasks.Task - // System.Threading.Tasks.TaskFactory.<>c__DisplayClass35_0 - // System.Threading.Tasks.TaskFactory.<>c__DisplayClass35_0 - // System.Threading.Tasks.TaskFactory - // System.Threading.Tasks.TaskFactory - // }} - - public void RefMethods() - { - // object DG.Tweening.TweenSettingsExtensions.OnComplete(object,DG.Tweening.TweenCallback) - // System.Void Stary.Evo.Architecture.RegisterSystem(object) - // Stary.Evo.IUnRegister Stary.Evo.CanRegisterEventExtension.RegisterEvent(Stary.Evo.ICanRegisterEvent,object,System.Action) - // System.Void Stary.Evo.CanRegisterEventExtension.UnRegisterEvent(Stary.Evo.ICanRegisterEvent,object,System.Action) - // System.Void Stary.Evo.CanSendEventExtension.SendEvent(Stary.Evo.ICanSendEvent,object,object) - // Stary.Evo.IUnRegister Stary.Evo.IArchitecture.RegisterEvent(object,System.Action) - // System.Void Stary.Evo.IArchitecture.SendEvent(object,object) - // System.Void Stary.Evo.IArchitecture.UnRegisterEvent(object,System.Action) - // System.Void Stary.Evo.IOCContainer.Register(object) - // System.Void Stary.Evo.StringEventSystem.Send(string,int) - // System.Threading.Tasks.Task Stary.Evo.UIFarme.IPanelSystem.PushStack(string,UnityEngine.Transform,string) - // object Stary.Evo.UnityEngineGameObjectExtension.GetOrAddComponent(UnityEngine.Component) - // object Stary.Evo.UnityEngineGameObjectExtension.GetOrAddComponent(UnityEngine.GameObject) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompletedd__4>(System.Runtime.CompilerServices.TaskAwaiter&,Main.DomainPanel.d__4&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompletedd__2>(System.Runtime.CompilerServices.TaskAwaiter&,Main.MainDomain.d__2&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompletedd__5>(System.Runtime.CompilerServices.TaskAwaiter&,Main.ScenePanel.d__5&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted,Main.DomainPanel.d__4>(System.Runtime.CompilerServices.TaskAwaiter&,Main.DomainPanel.d__4&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompletedd__4>(System.Runtime.CompilerServices.TaskAwaiter&,Main.DomainPanel.d__4&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompletedd__2>(System.Runtime.CompilerServices.TaskAwaiter&,Main.MainDomain.d__2&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompletedd__5>(System.Runtime.CompilerServices.TaskAwaiter&,Main.ScenePanel.d__5&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted,Main.DomainPanel.d__4>(System.Runtime.CompilerServices.TaskAwaiter&,Main.DomainPanel.d__4&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Startd__4>(Main.DomainPanel.d__4&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Startd__2>(Main.MainDomain.d__2&) - // System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Startd__5>(Main.ScenePanel.d__5&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompletedd__6>(System.Runtime.CompilerServices.TaskAwaiter&,Main.DomainPanel.d__6&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompletedd__9>(System.Runtime.CompilerServices.TaskAwaiter&,Main.ScenePanel.d__9&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompletedd__7>(System.Runtime.CompilerServices.TaskAwaiter&,Main.ScenePanel.d__7&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompletedd__8>(System.Runtime.CompilerServices.TaskAwaiter&,Main.ScenePanel.d__8&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Startd__6>(Main.DomainPanel.d__6&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Startd__9>(Main.ScenePanel.d__9&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Startd__7>(Main.ScenePanel.d__7&) - // System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Startd__8>(Main.ScenePanel.d__8&) - // object UnityEngine.Component.GetComponent() - // object UnityEngine.GameObject.AddComponent() - // object UnityEngine.GameObject.GetComponent() - // object YooAsset.AssetHandle.GetAssetObject() - // YooAsset.AssetHandle YooAsset.ResourcePackage.LoadAssetAsync(string,uint) - // YooAsset.AssetHandle YooAsset.YooAssets.LoadAssetAsync(string,uint) - } -} \ No newline at end of file diff --git a/Assets/HybridCLRGenerate/AOTGenericReferences.cs.meta b/Assets/HybridCLRGenerate/AOTGenericReferences.cs.meta deleted file mode 100644 index abd91da..0000000 --- a/Assets/HybridCLRGenerate/AOTGenericReferences.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: aa7477841f5656949a0ef46e1c739da1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HybridCLRGenerate/link.xml b/Assets/HybridCLRGenerate/link.xml deleted file mode 100644 index 0afd6b1..0000000 --- a/Assets/HybridCLRGenerate/link.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Main/main_webgl.unity b/Assets/Main/main_webgl.unity index 896c6ce..d0566fe 100644 --- a/Assets/Main/main_webgl.unity +++ b/Assets/Main/main_webgl.unity @@ -259,94 +259,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &468672898 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 468672900} - - component: {fileID: 468672899} - m_Layer: 0 - m_Name: VoiceSwitchingScene - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &468672899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 468672898} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97f6e15196934254c94bd3de1f798b77, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &468672900 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 468672898} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &479226269 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 479226271} - - component: {fileID: 479226270} - m_Layer: 0 - m_Name: TrackedImageEvoManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &479226270 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479226269} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: be33290f8aa3440cac3e24a68606958b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &479226271 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 479226269} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &540596587 GameObject: m_ObjectHideFlags: 0 @@ -583,5 +495,3 @@ SceneRoots: - {fileID: 66115580} - {fileID: 540596589} - {fileID: 1829387361} - - {fileID: 479226271} - - {fileID: 468672900} diff --git a/Assets/Resources/MainDomainAll.asset b/Assets/Resources/MainDomainAll.asset deleted file mode 100644 index 6be4ed1..0000000 --- a/Assets/Resources/MainDomainAll.asset +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2745f06c743a4d8aaf3d993312e39f02, type: 3} - m_Name: MainDomainAll - m_EditorClassIdentifier: - domainAll: - - isVideo: 0 - domainName: Tree diff --git a/Assets/Resources/MainDomainAll.asset.meta b/Assets/Resources/MainDomainAll.asset.meta deleted file mode 100644 index 3ce0c59..0000000 --- a/Assets/Resources/MainDomainAll.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8fce04c662e892f44a5237be36b53f2c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XR.meta b/Assets/StreamingAssets/yoo/Main.meta similarity index 77% rename from Assets/XR.meta rename to Assets/StreamingAssets/yoo/Main.meta index 458ce18..adde9c9 100644 --- a/Assets/XR.meta +++ b/Assets/StreamingAssets/yoo/Main.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: efc6362fafb048349a238a54068ff3a2 +guid: ab76806c010f45b43bb4d02b2d6ae73b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/StreamingAssets/yoo/Main/BuildinCatalog.bytes b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.bytes new file mode 100644 index 0000000..171e534 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.bytes differ diff --git a/Assets/StreamingAssets/yoo/Main/BuildinCatalog.bytes.meta b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.bytes.meta new file mode 100644 index 0000000..42f5f07 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cba86dd036695f540bd1dcb54ef2b273 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/BuildinCatalog.json b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.json new file mode 100644 index 0000000..9fec823 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.json @@ -0,0 +1,31 @@ +{ + "FileVersion": "1.0.0", + "PackageName": "Main", + "PackageVersion": "1.0.1", + "Wrappers": [ + { + "BundleGUID": "b7397f664171d1849bca567bceaa3f16", + "FileName": "main_assets_domain_main_addressableres_config.bundle" + }, + { + "BundleGUID": "b5530c4176ba90beccf5f12cdb420fa0", + "FileName": "main_assets_domain_main_addressableres_dll_android.bundle" + }, + { + "BundleGUID": "8821624ec055b156197fdeea9e014982", + "FileName": "main_assets_domain_main_addressableres_dll_webgl.bundle" + }, + { + "BundleGUID": "6f83a9e48779da3bc4ae811a45d1c60a", + "FileName": "main_assets_domain_main_addressableres_prefabs.bundle" + }, + { + "BundleGUID": "ae83a9c082df06db36e4458d52dc82ab", + "FileName": "main_assets_domain_main_addressableres_sprites.bundle" + }, + { + "BundleGUID": "131c369d2e925d2d22ff2cd65f5b5ed7", + "FileName": "main_unityshaders.bundle" + } + ] +} \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Main/BuildinCatalog.json.meta b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.json.meta new file mode 100644 index 0000000..7fea4f5 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/BuildinCatalog.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cb4f94f1a87851347b76acebb636a3a8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/Main.version b/Assets/StreamingAssets/yoo/Main/Main.version new file mode 100644 index 0000000..7f20734 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/Main.version @@ -0,0 +1 @@ +1.0.1 \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Main/Main.version.meta b/Assets/StreamingAssets/yoo/Main/Main.version.meta new file mode 100644 index 0000000..66ffed9 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/Main.version.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e3d44753ecc9a864d9f9ecde2a7e18cc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/Main_1.0.1.bytes b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.bytes new file mode 100644 index 0000000..62565c5 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.bytes differ diff --git a/Assets/StreamingAssets/yoo/Main/Main_1.0.1.bytes.meta b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.bytes.meta new file mode 100644 index 0000000..5cfd140 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2a7b96d3c86568c44acc4edf3f5a705a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/Main_1.0.1.hash b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.hash new file mode 100644 index 0000000..c66d48b --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.hash @@ -0,0 +1 @@ +44676e03 \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Main/Main_1.0.1.hash.meta b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.hash.meta new file mode 100644 index 0000000..564bc1f --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/Main_1.0.1.hash.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bfe31b0c9d253a9449ff97e456800577 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_config.bundle b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_config.bundle new file mode 100644 index 0000000..d552bc3 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_config.bundle differ diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_config.bundle.meta b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_config.bundle.meta new file mode 100644 index 0000000..89b7d81 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_config.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 079bf3a82e29cf84e90e6040bbff23da +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_android.bundle b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_android.bundle new file mode 100644 index 0000000..7bfd87f Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_android.bundle differ diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_android.bundle.meta b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_android.bundle.meta new file mode 100644 index 0000000..c1cf663 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_android.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 63688719389603c4397d3e2a300edbf4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_webgl.bundle b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_webgl.bundle new file mode 100644 index 0000000..e577444 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_webgl.bundle differ diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_webgl.bundle.meta b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_webgl.bundle.meta new file mode 100644 index 0000000..f3b9a85 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_dll_webgl.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 737f725ce965e874f9b290aa44b0fb6c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_prefabs.bundle b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_prefabs.bundle new file mode 100644 index 0000000..5c66e4c Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_prefabs.bundle differ diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_prefabs.bundle.meta b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_prefabs.bundle.meta new file mode 100644 index 0000000..2690e8d --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_prefabs.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 73caceece0afb904ba1980a2c553503a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_sprites.bundle b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_sprites.bundle new file mode 100644 index 0000000..5ae09a0 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_sprites.bundle differ diff --git a/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_sprites.bundle.meta b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_sprites.bundle.meta new file mode 100644 index 0000000..5674a90 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/main_assets_domain_main_addressableres_sprites.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1f9e982593cf62f4f9f58f60128ed04b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Main/main_unityshaders.bundle b/Assets/StreamingAssets/yoo/Main/main_unityshaders.bundle new file mode 100644 index 0000000..ae16273 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Main/main_unityshaders.bundle differ diff --git a/Assets/StreamingAssets/yoo/Main/main_unityshaders.bundle.meta b/Assets/StreamingAssets/yoo/Main/main_unityshaders.bundle.meta new file mode 100644 index 0000000..bd90ac2 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Main/main_unityshaders.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ec1116459977a64e8a47383cbd23071 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Setting.meta b/Assets/StreamingAssets/yoo/Test1.meta similarity index 77% rename from Assets/Setting.meta rename to Assets/StreamingAssets/yoo/Test1.meta index 408e5e1..f606e1c 100644 --- a/Assets/Setting.meta +++ b/Assets/StreamingAssets/yoo/Test1.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c88607dd0a68184b9f382afcf4b197d +guid: a0e4b2ad953641344901da04d3deebb6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.bytes b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.bytes new file mode 100644 index 0000000..d65a2c7 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.bytes differ diff --git a/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.bytes.meta b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.bytes.meta new file mode 100644 index 0000000..f339950 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2755ad5d3c8221346beb464cb2a0caa4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.json b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.json new file mode 100644 index 0000000..425b148 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.json @@ -0,0 +1,31 @@ +{ + "FileVersion": "1.0.0", + "PackageName": "Test1", + "PackageVersion": "1.0.1", + "Wrappers": [ + { + "BundleGUID": "48441b05be573c3d3c2282854939a891", + "FileName": "test1_assets_domain_test1_addressableres_config.bundle" + }, + { + "BundleGUID": "d86097162b32ad675e994ae92da62c2e", + "FileName": "test1_assets_domain_test1_addressableres_dll_android.bundle" + }, + { + "BundleGUID": "7a11900bbaa984e0c78906cfad6e05d0", + "FileName": "test1_assets_domain_test1_addressableres_dll_webgl.bundle" + }, + { + "BundleGUID": "e7aff701c4a9b22211ad36344ddd653c", + "FileName": "test1_assets_domain_test1_addressableres_prefabs.bundle" + }, + { + "BundleGUID": "57b9bc8b37900fc04bec7592d240bc53", + "FileName": "test1_share_packages_com_unity_render-pipelines_universal_runtime_materials.bundle" + }, + { + "BundleGUID": "56df576c4bf0f379d31ccb2167ffd6a0", + "FileName": "test1_unityshaders.bundle" + } + ] +} \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.json.meta b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.json.meta new file mode 100644 index 0000000..d7fb2dd --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/BuildinCatalog.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4e315e226281d86448c787866cc1649b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/Test1.version b/Assets/StreamingAssets/yoo/Test1/Test1.version new file mode 100644 index 0000000..7f20734 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/Test1.version @@ -0,0 +1 @@ +1.0.1 \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Test1/Test1.version.meta b/Assets/StreamingAssets/yoo/Test1/Test1.version.meta new file mode 100644 index 0000000..83aa258 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/Test1.version.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1ddf73874bd77347bb42ef2c26c366f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.bytes b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.bytes new file mode 100644 index 0000000..b9edefb Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.bytes differ diff --git a/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.bytes.meta b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.bytes.meta new file mode 100644 index 0000000..c56b99f --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2fc54facc48467b44a9dfc3a43f6b81b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.hash b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.hash new file mode 100644 index 0000000..ecb33f3 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.hash @@ -0,0 +1 @@ +7d025280 \ No newline at end of file diff --git a/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.hash.meta b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.hash.meta new file mode 100644 index 0000000..480f5b2 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/Test1_1.0.1.hash.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b6d3da9b93f158241af5e561bd90cf03 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_config.bundle b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_config.bundle new file mode 100644 index 0000000..4026826 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_config.bundle differ diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_config.bundle.meta b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_config.bundle.meta new file mode 100644 index 0000000..05f5d0d --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_config.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 07fd2e6376af1f34f89e362e30cc528f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_android.bundle b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_android.bundle new file mode 100644 index 0000000..28b5510 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_android.bundle differ diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_android.bundle.meta b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_android.bundle.meta new file mode 100644 index 0000000..8827770 --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_android.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 092efdd04ccee4c4a94ecc88d947ffdb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_webgl.bundle b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_webgl.bundle new file mode 100644 index 0000000..cf60d39 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_webgl.bundle differ diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_webgl.bundle.meta b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_webgl.bundle.meta new file mode 100644 index 0000000..543365d --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_dll_webgl.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0f6b5566d1211145a0a80e13b58727b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_prefabs.bundle b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_prefabs.bundle new file mode 100644 index 0000000..fa17d16 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_prefabs.bundle differ diff --git a/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_prefabs.bundle.meta b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_prefabs.bundle.meta new file mode 100644 index 0000000..ce185fe --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/test1_assets_domain_test1_addressableres_prefabs.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b80f0d83fa5977e47a47881419b6d6c8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/test1_share_packages_com_unity_render-pipelines_universal_runtime_materials.bundle b/Assets/StreamingAssets/yoo/Test1/test1_share_packages_com_unity_render-pipelines_universal_runtime_materials.bundle new file mode 100644 index 0000000..fe0118d Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/test1_share_packages_com_unity_render-pipelines_universal_runtime_materials.bundle differ diff --git a/Assets/StreamingAssets/yoo/Test1/test1_share_packages_com_unity_render-pipelines_universal_runtime_materials.bundle.meta b/Assets/StreamingAssets/yoo/Test1/test1_share_packages_com_unity_render-pipelines_universal_runtime_materials.bundle.meta new file mode 100644 index 0000000..cf31eaa --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/test1_share_packages_com_unity_render-pipelines_universal_runtime_materials.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0c306222cfdc58c439d4a9336a80c8e6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/yoo/Test1/test1_unityshaders.bundle b/Assets/StreamingAssets/yoo/Test1/test1_unityshaders.bundle new file mode 100644 index 0000000..b542c25 Binary files /dev/null and b/Assets/StreamingAssets/yoo/Test1/test1_unityshaders.bundle differ diff --git a/Assets/StreamingAssets/yoo/Test1/test1_unityshaders.bundle.meta b/Assets/StreamingAssets/yoo/Test1/test1_unityshaders.bundle.meta new file mode 100644 index 0000000..0e2e00a --- /dev/null +++ b/Assets/StreamingAssets/yoo/Test1/test1_unityshaders.bundle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 26d4e8d64e82edd43875a89c6a48be0e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/EvoSetting.meta b/Assets/WX-WASM-SDK-V2.meta similarity index 77% rename from Assets/Resources/EvoSetting.meta rename to Assets/WX-WASM-SDK-V2.meta index 64dbbd0..cee6de1 100644 --- a/Assets/Resources/EvoSetting.meta +++ b/Assets/WX-WASM-SDK-V2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 73fb6f6e6ed79734fafe90599bfa9490 +guid: af47237aed86ed2488788d9c56af0dad folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/WebGLTemplates.meta b/Assets/WebGLTemplates.meta new file mode 100644 index 0000000..5cb6971 --- /dev/null +++ b/Assets/WebGLTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28bdbd1cfea981f41804c99afd530a75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XRI.meta b/Assets/XRI.meta deleted file mode 100644 index 7c1b26c..0000000 --- a/Assets/XRI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c958d2ba63f24dd449f7825e7a43b8f1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/link.xml b/Assets/link.xml index 2011d10..67fde9d 100644 --- a/Assets/link.xml +++ b/Assets/link.xml @@ -72,4 +72,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/EditorPrefs.ini b/EditorPrefs.ini index 2b17db0..9e1dbd4 100644 --- a/EditorPrefs.ini +++ b/EditorPrefs.ini @@ -1,8 +1,9 @@ # Custom Editor Prefs Data -# Last Modified: 2026/4/21 10:34:47 +# Last Modified: 2026/6/5 21:56:23 CreatDomainDirectory=1 ChangeHotUpdateSchema=HotUpdate -ChangePlayerSchema=HOST_PLAYMODE +ChangePlayerSchema=EDITOR_SIMULATEMODE ip=http://106.52.62.106:9527 -Authorization=Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjE0NGIyN2NkLWU5NDEtNDk5Zi04MGViLWY5MmYxYTBmNDgzMSIsInVuaXF1ZV9uYW1lIjoidW5pdHkiLCJlbWFpbCI6InphemU5N0BxcS5jb20iLCJuYW1laWQiOiIxNDRiMjdjZC1lOTQxLTQ5OWYtODBlYi1mOTJmMWEwZjQ4MzEiLCJyb2xlIjoiY2xpZW50IiwibmJmIjoxNzc2NzM4NDg0LCJleHAiOjE3NzkzMzA0ODQsImlhdCI6MTc3NjczODQ4NCwiaXNzIjoieW91ci1pc3N1ZXIiLCJhdWQiOiJ5b3VyLWF1ZGllbmNlIn0.MQ2WcRYFDHW2YRGJ1QKiq48liVG1mm6VklA7q_FUzuw +Authorization=Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjE0NGIyN2NkLWU5NDEtNDk5Zi04MGViLWY5MmYxYTBmNDgzMSIsInVuaXF1ZV9uYW1lIjoidW5pdHkiLCJlbWFpbCI6InphemU5N0BxcS5jb20iLCJuYW1laWQiOiIxNDRiMjdjZC1lOTQxLTQ5OWYtODBlYi1mOTJmMWEwZjQ4MzEiLCJyb2xlIjoiY2xpZW50IiwibmJmIjoxNzgwNjY3Nzc4LCJleHAiOjE3ODMyNTk3NzgsImlhdCI6MTc4MDY2Nzc3OCwiaXNzIjoieW91ci1pc3N1ZXIiLCJhdWQiOiJ5b3VyLWF1ZGllbmNlIn0.2bkEAIoK3w56WuvspwKHPy9AtNE7YbaKbKFGlWcOmUI +StartUp=1 diff --git a/Packages/manifest.json b/Packages/manifest.json index 0896887..88bea46 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,9 +3,8 @@ "com.qq.weixin.minigame": "0.1.32", "com.staryevo.audiocore": "1.1.3", "com.staryevo.buildoriginality": "1.1.4", - "com.staryevo.main": "2.1.14", - "com.staryevo.rktools": "1.1.7", - "com.staryevo.tools": "1.4.28", + "com.staryevo.main": "2.2.0", + "com.staryevo.tools": "1.5.1", "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "1.1.5", "com.unity.collab-proxy": "2.6.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cebeba2..eb11edd 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -41,7 +41,7 @@ "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, "com.staryevo.main": { - "version": "2.1.14", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": { @@ -50,17 +50,8 @@ }, "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" }, - "com.staryevo.rktools": { - "version": "1.1.7", - "depth": 0, - "source": "registry", - "dependencies": { - "com.cysharp.unitask": "2.5.10" - }, - "url": "http://106.52.62.106:3000/api/packages/unity-registry/npm" - }, "com.staryevo.tools": { - "version": "1.4.28", + "version": "1.5.1", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9c879ce..bfee5fd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -776,7 +776,7 @@ PlayerSettings: Stadia: DOTWEEN Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;USE_ROKID_OPENXR;USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;DOTWEEN;HotUpdate;HOST_PLAYMODE VisionOS: DOTWEEN - WebGL: DOTWEEN;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;USE_ROKID_OPENXR;HotUpdate;WEIXINMINIGAME + WebGL: DOTWEEN;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;USE_ROKID_OPENXR;HotUpdate;EDITOR_SIMULATEMODE Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_STICK_CONTROL_THUMBSTICKS;DOTWEEN XboxOne: DOTWEEN iPhone: DOTWEEN