diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 7cd81d029f..a6bc9ba6d6 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -405,7 +405,7 @@ public class AutoPack : EditorWindow "git add ." + printlog, "echo git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, "git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, - + "git push", }; ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], commands); EditorUtility.ClearProgressBar(); diff --git a/Assets/ManagedResources/BGNC/loading_caohua.png.meta b/Assets/ManagedResources/BGNC/loading_caohua.png.meta deleted file mode 100644 index 2370193f7f..0000000000 --- a/Assets/ManagedResources/BGNC/loading_caohua.png.meta +++ /dev/null @@ -1,121 +0,0 @@ -fileFormatVersion: 2 -guid: debe0b026ec67894ea4854b4dad48e21 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: d8b82d28f899bb54dadeb644d19aac67 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: lz4/bgnc/loading_caohua - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BGNC/loading_xipu_2.jpg.meta b/Assets/ManagedResources/BGNC/loading_xipu_2.jpg.meta deleted file mode 100644 index 7e16254c73..0000000000 --- a/Assets/ManagedResources/BGNC/loading_xipu_2.jpg.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 42305eec223abab478aefd6f970de194 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 4712a1414ca412d4482e2b542dd85783 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/login_caohua.png.meta b/Assets/ManagedResources/BGNC/login_caohua.png.meta deleted file mode 100644 index cba22f887c..0000000000 --- a/Assets/ManagedResources/BGNC/login_caohua.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: 1f89f317485449b4682324aa3ea3a6c2 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 6065f0ba99fca4f4eb7df038d3995089 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: lz4/bgnc/login_caohua - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BGNC/login_xipu_2.jpg.meta b/Assets/ManagedResources/BGNC/login_xipu_2.jpg.meta deleted file mode 100644 index 268c19565f..0000000000 --- a/Assets/ManagedResources/BGNC/login_xipu_2.jpg.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: ee7fd5016d6302543a04615e45f802c6 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 263f5516c18d76546823718924314c55 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/logo_caohua.png.meta b/Assets/ManagedResources/BGNC/logo_caohua.png.meta deleted file mode 100644 index 8e91476f6e..0000000000 --- a/Assets/ManagedResources/BGNC/logo_caohua.png.meta +++ /dev/null @@ -1,121 +0,0 @@ -fileFormatVersion: 2 -guid: 0752922022d678449b67d6c59a1bd6cf -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 100 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: f31bfb7b5b275f8499950f8d9e08726b - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: lz4/bgnc/logo_caohua - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Prefabs/UI/UIRoot/UIRoot.prefab b/Assets/ManagedResources/Prefabs/UI/UIRoot/UIRoot.prefab index 788678131c..f87f1dc102 100644 --- a/Assets/ManagedResources/Prefabs/UI/UIRoot/UIRoot.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UIRoot/UIRoot.prefab @@ -244,7 +244,7 @@ Camera: field of view: 60 orthographic: 1 orthographic size: 3.6 - m_Depth: 100 + m_Depth: 99 m_CullingMask: serializedVersion: 2 m_Bits: 4294966783 diff --git a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab index 78b448a2ea..3cbbf69ea0 100644 --- a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab +++ b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab @@ -896,7 +896,7 @@ Camera: field of view: 60 orthographic: 1 orthographic size: 3.6 - m_Depth: 0 + m_Depth: 100 m_CullingMask: serializedVersion: 2 m_Bits: 4294966527 diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index f7afa8af8e..0cb15bcad5 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -23,8 +23,23 @@ function PackageManager.Initialize() break end end + + -- 获取stream设置 + if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_LOAD_STREAMING) then + resMgr:LoadStreamingText("PackConfig", function(config) + local json = require 'cjson' + local data = json.decode(config) + this.StreamConfig = data + end) + end end +-- 获取包名 +function PackageManager.GetPackageID() + if this.StreamConfig then + return this.StreamConfig.PackID + end +end -- 获取包名 function PackageManager.GetPackageName() return this.PackageName @@ -37,12 +52,18 @@ function PackageManager.GetRechargeField() end -- 获取登录背景图 function PackageManager.GetLoginPanelBg() + if this.StreamConfig then + return this.StreamConfig.LoginPanelBG + end if this.config then return this.config.LoginPanelBg end end -- 获取登录Logo function PackageManager.GetLoginPanelLogo() + if this.StreamConfig then + return this.StreamConfig.LoginPanelLogo + end if this.config then return this.config.LoginLogo end @@ -55,6 +76,10 @@ function PackageManager.GetCustomEventField() end -- 获取loading图list function PackageManager.GetLoadingList() + if this.StreamConfig then + local list = string.split(this.StreamConfig.LoadingPanelBG, "#") + return list + end if this.config then local list = string.split(this.config.LoadingImgList, "#") return list @@ -79,7 +104,7 @@ function PackageManager.SetVideo(obj, bg) local video = obj:GetComponent("VideoPlayer") -- video.url = ServerConfigManager.GetVersionInfo("resUrl") .. AppConst.PlatformPath .."/"..tostring(this.config.VideoName) ..".mp4" -- video.clip = resMgr:LoadAsset(this.config.VideoName) - video.url = AppConst.PersistentDataPath .."/"..tostring(this.config.VideoName) + video.url = "file://" .. AppConst.PersistentDataPath .."/"..tostring(this.config.VideoName) video:Play() bg:DOFade(0, 2) obj:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 5f1390db5c..fe38ed7dcd 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -17,6 +17,7 @@ ServerConfigManager.SettingConfig = { IS_PLAY_LOGIN_VIDEO = "IS_PLAY_LOGIN_VIDEO", -- 判断是否可以播放登录视频 PACKAGE_CONFIG = "PACKAGE_CONFIG", -- 包配置 IS_NO_TALKING = "IS_NO_TALKING", -- 禁言 + IS_LOAD_STREAMING = "IS_LOAD_STREAMING", -- 是否加载外部资源 } diff --git a/Assets/ManagedResources/~Lua/Logic/Game.lua b/Assets/ManagedResources/~Lua/Logic/Game.lua index 57f43ebdb7..3596322a44 100644 --- a/Assets/ManagedResources/~Lua/Logic/Game.lua +++ b/Assets/ManagedResources/~Lua/Logic/Game.lua @@ -14,8 +14,11 @@ function Game.Initialize() Screen.sleepTimeout = U3d.SleepTimeout.NeverSleep this.GlobalEvent = EventManager.New() this.InitManagers() - UIManager.OpenPanel(UIName.LoginPanel) - UIManager.OpenPanel(UIName.HorseRaceLampView) + -- 延迟 + Timer.New(function() + UIManager.OpenPanel(UIName.LoginPanel) + UIManager.OpenPanel(UIName.HorseRaceLampView) + end, 0.1):Start() end --初始化管理器 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 1ef8693802..6f68666d5d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4198,10 +4198,6 @@ local passivityList = { end PassiveManager.passiveCountList[role.camp][200] = 1 local f1 = args[1] - -- if PassiveManager.passiveCountList[role.camp][200] and PassiveManager.passiveCountList[role.camp][200] > 0 then - -- return - -- end - -- PassiveManager.passiveCountList[role.camp][200] = 1 local onFinalDamage = function(damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit, damageType) local ignoreShara=atkRole.ignoreShara --特殊处理 白骨精附加的普攻不会忽略分摊 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 352892fa66..5468afe6f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -59,19 +59,26 @@ function this:InitComponent() this.versionText = Util.GetGameObject(this.loginPart, "version"):GetComponent("Text") this.versionText.text = Language[11136]..LoginRoot_Version + -- this.bg1 = Util.GetGameObject(this.gameObject, "bg11"):GetComponent("RawImage") + -- resMgr:SetStreamingTexture(this.bg1, "login_caohua.png") + -- 背景 this.bg = Util.GetGameObject(this.gameObject, "bg"):GetComponent("Image") this.bgStr = PackageManager.GetLoginPanelBg() - if this.bgStr then - this.bg.sprite = this.spLoader:LoadSprite(this.bgStr) - end + this.bg.color = Color.New(1, 1, 1, 0) + LoadStreamingTexture(this.spLoader, this.bgStr, function(sp) + this.bg.sprite = sp + this.bg.color = Color.New(1, 1, 1, 1) + end) -- logo this.logo = Util.GetGameObject(this.gameObject, "logo"):GetComponent("Image") this.logoStr = PackageManager.GetLoginPanelLogo() - if this.logoStr then - this.logo.gameObject:SetActive(true) - this.logo.sprite = this.spLoader:LoadSprite(this.logoStr) - this.logo:SetNativeSize() + if this.logoStr and this.logoStr ~= "" then + LoadStreamingTexture(this.spLoader, this.logoStr, function(sp) + this.logo.gameObject:SetActive(true) + this.logo.sprite = sp + this.logo:SetNativeSize() + end) else this.logo.gameObject:SetActive(false) end diff --git a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua index ef39a4875e..f08f32b7a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua @@ -4,8 +4,6 @@ local this = LoadingPanel local tipsConfig = ConfigManager.GetConfig(ConfigName.Tips) --初始化组件(用于子类重写) function LoadingPanel:InitComponent() - -- 创建sprite加载器 - this.spLoader = SpriteLoader.New() -- this.Slider = Util.GetGameObject(self.gameObject, "Slider"):GetComponent("Slider") this.Tip = Util.GetGameObject(self.gameObject, "Slider/Image/LoadingText"):GetComponent("Text") @@ -15,23 +13,15 @@ function LoadingPanel:InitComponent() screenAdapte(Util.GetGameObject(self.gameObject, "bg2")) end -function LoadingPanel:OnOpen() +function LoadingPanel:OnOpen(sp) local index = 0 - math.randomseed(os.time()) - local spName = "loading1" - local sprites = PackageManager.GetLoadingList() - if sprites then - index = math.random(1, #sprites) - spName = sprites[index] - end - this.bg.sprite = this.spLoader:LoadSprite(spName) + this.bg.sprite = sp math.randomseed(os.time()) index = math.random(1, 20) this.Tip.text = GetLanguageStrById(tipsConfig[index].Tips) end -- 销毁时回收 function LoadingPanel:OnDestroy() - this.spLoader:Destroy() end local callList = {} local curIndex = 0 @@ -72,23 +62,37 @@ end function LoadingPanel.Start() - if #callList <= 1 then - return + -- 创建sprite加载器 + this.spLoader = SpriteLoader.New() + + local spName = "loading1" + local sprites = PackageManager.GetLoadingList() + if sprites then + math.randomseed(os.time()) + local index = math.random(1, #sprites) + spName = sprites[index] end - UIManager.OpenPanel(UIName.LoadingPanel) - UpdateBeat:Add(update) - lerp = 0 - curIndex = 0 - this.Slider.maxValue = #callList - 1 - this.Slider.value = curIndex - --"你知道嘛:充值会让你变得更强!" --"白驹工作室倾情奉献" - LoadingPanel.OnStep() + LoadStreamingTexture(this.spLoader, spName, function(sp) + if #callList <= 1 then + return + end + UIManager.OpenPanel(UIName.LoadingPanel, sp) + UpdateBeat:Add(update) + lerp = 0 + curIndex = 0 + this.Slider.maxValue = #callList - 1 + this.Slider.value = curIndex + --"你知道嘛:充值会让你变得更强!" --"白驹工作室倾情奉献" + LoadingPanel.OnStep() + end) end function LoadingPanel.End() UpdateBeat:Remove(update) this:ClosePanel() callList = {} + + this.spLoader:Destroy() end return LoadingPanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/misc/functions.lua b/Assets/ManagedResources/~Lua/misc/functions.lua index 5de6bfed7c..4e411fcb28 100644 --- a/Assets/ManagedResources/~Lua/misc/functions.lua +++ b/Assets/ManagedResources/~Lua/misc/functions.lua @@ -75,4 +75,24 @@ function ForceRebuildLayout(_transform) end LayoutRebuilder.ForceRebuildLayoutImmediate(_transform) end +end + +function LoadStreamingTexture(spLoader, name, func) + if name and name ~= "" and func then + if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_LOAD_STREAMING) then + resMgr:LoadStreamingTexture(name, function(sp) + if sp then + func(sp) + else + name = string.split(name, ".")[1] + local sp = spLoader:LoadSprite(name) + func(sp) + end + end) + else + name = string.split(name, ".")[1] + local sp = spLoader:LoadSprite(name) + func(sp) + end + end end \ No newline at end of file diff --git a/Assets/Scripts/Bridge/ResourcesManager.cs b/Assets/Scripts/Bridge/ResourcesManager.cs index d4f2516982..8b9861d3be 100644 --- a/Assets/Scripts/Bridge/ResourcesManager.cs +++ b/Assets/Scripts/Bridge/ResourcesManager.cs @@ -187,6 +187,15 @@ namespace GameLogic { { } + public void LoadStreamingTexture(string name, LuaFunction luaFunction) + { + resMgr.LoadStreamingTexture(name, luaFunction); + } + + public void LoadStreamingText(string name, LuaFunction luaFunction) + { + resMgr.LoadStreamingText(name, luaFunction); + } } } diff --git a/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs b/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs index b318bdb805..bfc90fea50 100644 --- a/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs +++ b/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs @@ -3,6 +3,10 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Events; using GameCore; +using UnityEngine.UI; +using UnityEngine.Networking; +using LuaInterface; + namespace ResMgr { /// @@ -119,5 +123,61 @@ namespace ResMgr { resLoader.Update(); } #endif + + + public void LoadStreamingTexture(string name, LuaFunction luaFunction) + { + StartCoroutine(LoadTextureFromStream(name, luaFunction)); + } + public IEnumerator LoadTextureFromStream(string name, LuaFunction luaFunction) + { + Debug.Log(Application.streamingAssetsPath + "/Res/" + name + ".png"); + UnityWebRequest www = UnityWebRequestTexture.GetTexture(Application.streamingAssetsPath + "/Res/"+ name + ".png"); + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + Debug.Log(www.error); + if (luaFunction != null) + { + luaFunction.Call(false); + } + }else + { + Texture2D tex = ((DownloadHandlerTexture)www.downloadHandler).texture; + Sprite sp = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0, 0)); + if (luaFunction != null) + { + luaFunction.Call(sp); + } + } + } + + public void LoadStreamingText(string name, LuaFunction luaFunction) + { + StartCoroutine(LoadTextFromStream(name, luaFunction)); + } + public IEnumerator LoadTextFromStream(string name, LuaFunction luaFunction) + { + Debug.Log(Application.streamingAssetsPath + "/Res/" + name + ".txt"); + UnityWebRequest www = UnityWebRequest.Get(Application.streamingAssetsPath + "/Res/" + name + ".txt"); + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + Debug.Log(www.error); + if (luaFunction != null) + { + luaFunction.Call(false); + } + } + else + { + string tex = www.downloadHandler.text; + if (luaFunction != null) + { + luaFunction.Call(tex); + } + } + } + } } diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index 8488914c59..17d118d5e7 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -253,6 +253,11 @@ namespace GameEditor.FrameTool new string[]{ "灵动-专服", "mht_china/zf", "cdn_mht_zf_release", "china/zf_test" }, new string[]{ "草花", "mht_china/zf", "cdn_caohua", "china/zf_test" }, new string[]{ "喜扑", "mht_china/zf", "cdn_xipu", "china/zf_test" }, + + new string[]{ "先遣-内网", "mht_china/local", "local12_cn_local", "china/local" }, + new string[]{ "先遣-测试", "mht_china/xq", "cdn_xq_test", "china/test" }, + new string[]{ "先遣-正式", "mht_china/xq", "cdn_xq_release", "china/test" }, + }; static Dictionary _HotFixConfigDic = new Dictionary(); @@ -497,6 +502,7 @@ namespace GameEditor.FrameTool EditorUtility.DisplayProgressBar("正在提交到GIT:", commitName, 1f); ProcessUtil.ProcessCommand(toPath, "git add ."); ProcessUtil.ProcessCommand(toPath, "git commit -m " + commitName); + ProcessUtil.ProcessCommand(toPath, "git push"); EditorUtility.ClearProgressBar(); } @@ -547,11 +553,13 @@ namespace GameEditor.FrameTool } log.Add("CDN TYPE: "+ info["cdn_type"]); string toolsDir = _HotFixProjectPath + "/Tools/" + info["cdn_type"]; - string command = string.Format("python UpLoad.py {0} {1} {2}>>{3}", _HotFixProjectPath + "/Root/" + hfs.dir_name, hfs.dir_cdn_setting, changeFileName, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); log.Add("TOOLS DIR: " + toolsDir); + string command = string.Format("python UpLoad.py {0} {1} {2}>>{3}", _HotFixProjectPath + "/Root/" + hfs.dir_name, hfs.dir_cdn_setting, changeFileName, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); log.Add("UPLOAD COMMAND: " + command); ProcessUtil.ProcessCommand(toolsDir, command); - + string flushCommand = string.Format("python Flush.py {0}>>{1}", hfs.cdn_version.resUrl, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); + log.Add("Flush COMMAND: " + flushCommand); + ProcessUtil.ProcessCommand(toolsDir, flushCommand); // write log EditorUtility.DisplayProgressBar("正在生成Log文件:", logName, 1f); WriteLog(hfs.path_cdn_setting + "__HotFixLog", logName, log.ToArray()); @@ -561,10 +569,10 @@ namespace GameEditor.FrameTool EditorUtility.DisplayProgressBar("正在提交到GIT:", commitName, 1f); ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git add ."); ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git commit -m " + commitName); + ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git push"); EditorUtility.ClearProgressBar(); } - - + private static void WriteLog(string path, string name, string[] contents) { diff --git a/Assets/Scripts/GameInit/UpdatePanel.cs b/Assets/Scripts/GameInit/UpdatePanel.cs index 0bab0eaf08..5459bd96b2 100644 --- a/Assets/Scripts/GameInit/UpdatePanel.cs +++ b/Assets/Scripts/GameInit/UpdatePanel.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using UnityEngine.UI; using UnityEngine; using ResUpdate; +using UnityEngine.Networking; namespace GameLogic { @@ -36,41 +37,64 @@ namespace GameLogic BeginUpdatePlatform(); } - - private void OnEnable() + public IEnumerator LoadFromStream(Action act) { - string updatePanelBg = ConfigManager.Instance.GetConfigInfo("Setting.UPDATE_PANEL_BG2.value"); - if (updatePanelBg == null || updatePanelBg == "") + Debug.Log(Application.streamingAssetsPath + "/Res/PackConfig.txt"); + UnityWebRequest uwr = UnityWebRequest.Get(Application.streamingAssetsPath + "/Res/PackConfig.txt"); + yield return uwr.SendWebRequest(); + if (uwr.isNetworkError || uwr.isHttpError) { - updatePanelBg = ConfigManager.Instance.GetConfigInfo("Setting.UPDATE_PANEL_BG.value"); - } - if (updatePanelBg != null && updatePanelBg != "") - { - if (AppConst.bundleMode) + Debug.Log(uwr.error); + if (act != null) { - string path = AppConst.PersistentDataPath + "lz4/bgnc/" + updatePanelBg + ".unity3d"; - if (!File.Exists(path)) + act(null); + } + } + else + { + Hashtable table = MiniJSON.jsonDecode(uwr.downloadHandler.text) as Hashtable; + string bgName = table["UpdatePanelBG"] as string; + + UnityWebRequest www = UnityWebRequestTexture.GetTexture(Application.streamingAssetsPath + "/Res/" + bgName + ".png"); + yield return www.SendWebRequest(); + if (www.isNetworkError || www.isHttpError) + { + Debug.Log(www.error); + if (act != null) { - path = AppConst.StreamPath + "lz4/bgnc/" + updatePanelBg + ".unity3d"; + act(null); } - bundle = AssetBundle.LoadFromFile(path, 0, GameLogic.AppConst.EncyptBytesLength); - if (bundle == null) - { - XDebug.Log.error(string.Format("{0} 不存在,请检查", path)); - return; - } - this.transform.Find("Canvas/LoadingScreen/bg1").GetComponent().sprite = bundle.LoadAsset(updatePanelBg); } else { -#if UNITY_EDITOR - string path = AppConst.GameResPath + "/BGNC/" + updatePanelBg + ".jpg"; - Sprite sp = UnityEditor.AssetDatabase.LoadAssetAtPath(path); - this.transform.Find("Canvas/LoadingScreen/bg1").GetComponent().sprite = sp; -#endif + Debug.Log("load success"); + Texture2D tex = ((DownloadHandlerTexture)www.downloadHandler).texture; + Sprite sp = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0, 0)); + if (act != null) + { + act(sp); + } } } } + + + private void OnEnable() + { + GameObject go = this.transform.Find("Canvas").gameObject; + go.SetActive(false); + Image img = this.transform.Find("Canvas/LoadingScreen/bg1").GetComponent(); + img.color = new Color(1f, 1f, 1f, 0f); + StartCoroutine(LoadFromStream((Sprite sp) => + { + if (sp != null) + { + img.sprite = sp; + } + img.color = new Color(1f, 1f, 1f, 1f); + go.SetActive(true); + })); + } private void OnDestroy() { string updatePanelBg = ConfigManager.Instance.GetConfigInfo("Setting.UPDATE_PANEL_BG.value"); @@ -366,10 +390,11 @@ namespace GameLogic IEnumerator UpdateFinish() { yield return new WaitForSeconds(0.2f); + App.Instance.StartUp(); + yield return new WaitForSeconds(1f); DestroyImmediate(this.gameObject); UpdateManager.Instance.UnLoadUpdateAsset(); - App.Instance.StartUp(); } } } \ No newline at end of file diff --git a/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs b/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs index 2367a7777e..da32e68c53 100644 --- a/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs +++ b/Assets/Source/Generate/GameLogic_ResourcesManagerWrap.cs @@ -18,6 +18,8 @@ public class GameLogic_ResourcesManagerWrap L.RegFunction("HaveAsset", HaveAsset); L.RegFunction("UnLoadAll", UnLoadAll); L.RegFunction("Reset", Reset); + L.RegFunction("LoadStreamingTexture", LoadStreamingTexture); + L.RegFunction("LoadStreamingText", LoadStreamingText); L.RegFunction("New", _CreateGameLogic_ResourcesManager); L.RegFunction("__tostring", ToLua.op_ToString); L.RegVar("isLoading", get_isLoading, set_isLoading); @@ -252,6 +254,42 @@ public class GameLogic_ResourcesManagerWrap } } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LoadStreamingTexture(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 3); + GameLogic.ResourcesManager obj = (GameLogic.ResourcesManager)ToLua.CheckObject(L, 1); + string arg0 = ToLua.CheckString(L, 2); + LuaFunction arg1 = ToLua.CheckLuaFunction(L, 3); + obj.LoadStreamingTexture(arg0, arg1); + return 0; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int LoadStreamingText(IntPtr L) + { + try + { + ToLua.CheckArgsCount(L, 3); + GameLogic.ResourcesManager obj = (GameLogic.ResourcesManager)ToLua.CheckObject(L, 1); + string arg0 = ToLua.CheckString(L, 2); + LuaFunction arg1 = ToLua.CheckLuaFunction(L, 3); + obj.LoadStreamingText(arg0, arg1); + return 0; + } + catch (Exception e) + { + return LuaDLL.toluaL_exception(L, e); + } + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int get_isLoading(IntPtr L) { diff --git a/Assets/StreamingAssets/Res.meta b/Assets/StreamingAssets/Res.meta new file mode 100644 index 0000000000..8d15008b25 --- /dev/null +++ b/Assets/StreamingAssets/Res.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5727491f68c20440ba86bbc2d4de281 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Res/PackConfig.txt b/Assets/StreamingAssets/Res/PackConfig.txt new file mode 100644 index 0000000000..efe9eee5ab --- /dev/null +++ b/Assets/StreamingAssets/Res/PackConfig.txt @@ -0,0 +1,8 @@ +{ + "PackID":"XIPU_2", + "UpdatePanelBG":"loading_xipu", + "LoginPanelBG":"login_xipu", + "LoginPanelLogo":"", + "LoginPanelVideoBG":"", + "LoadingPanelBG":"loading_xipu" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/Res/PackConfig.txt.meta b/Assets/StreamingAssets/Res/PackConfig.txt.meta new file mode 100644 index 0000000000..2c0bf72170 --- /dev/null +++ b/Assets/StreamingAssets/Res/PackConfig.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0329a008458aa34fb72f1b0b6235956 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Res/_ReadMe.md b/Assets/StreamingAssets/Res/_ReadMe.md new file mode 100644 index 0000000000..4e1fa93a1e --- /dev/null +++ b/Assets/StreamingAssets/Res/_ReadMe.md @@ -0,0 +1,7 @@ +包配置PackConfig.txt参数字段说明: +PackID 用于标识母包的唯一ID +UpdatePanelBG 更新界面背景(只支持png) +LoginPanelBG 登录界面背景(只支持png) +LoginPanelLogo 登录界面Logo(只支持png) +LoginPanelVideoBG 登录界面视频背景(只支持mp4) +LoadingPanelBG 登录后游戏加载界面背景(只支持png,多个背景随机请用#号分割) \ No newline at end of file diff --git a/Assets/StreamingAssets/Res/_ReadMe.md.meta b/Assets/StreamingAssets/Res/_ReadMe.md.meta new file mode 100644 index 0000000000..020d34c281 --- /dev/null +++ b/Assets/StreamingAssets/Res/_ReadMe.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6cea870a7886a3e4f808a01de19b2fef +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/loading_caohua.png b/Assets/StreamingAssets/Res/loading_caohua.png similarity index 100% rename from Assets/ManagedResources/BGNC/loading_caohua.png rename to Assets/StreamingAssets/Res/loading_caohua.png diff --git a/Assets/StreamingAssets/Res/loading_caohua.png.meta b/Assets/StreamingAssets/Res/loading_caohua.png.meta new file mode 100644 index 0000000000..5a61398fbf --- /dev/null +++ b/Assets/StreamingAssets/Res/loading_caohua.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 714d2ce88cdf29747957c31e9807acfd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/loading_xipu_2.jpg b/Assets/StreamingAssets/Res/loading_xipu.png similarity index 100% rename from Assets/ManagedResources/BGNC/loading_xipu_2.jpg rename to Assets/StreamingAssets/Res/loading_xipu.png diff --git a/Assets/StreamingAssets/Res/loading_xipu.png.meta b/Assets/StreamingAssets/Res/loading_xipu.png.meta new file mode 100644 index 0000000000..2e0648db66 --- /dev/null +++ b/Assets/StreamingAssets/Res/loading_xipu.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1240de5e6b99f7c449f4863c5e61b133 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/login_caohua.png b/Assets/StreamingAssets/Res/login_caohua.png similarity index 100% rename from Assets/ManagedResources/BGNC/login_caohua.png rename to Assets/StreamingAssets/Res/login_caohua.png diff --git a/Assets/StreamingAssets/Res/login_caohua.png.meta b/Assets/StreamingAssets/Res/login_caohua.png.meta new file mode 100644 index 0000000000..245d039ed2 --- /dev/null +++ b/Assets/StreamingAssets/Res/login_caohua.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dc10eb4c834f3da4da5829c7d778ad91 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/login_xipu_2.jpg b/Assets/StreamingAssets/Res/login_xipu.png similarity index 100% rename from Assets/ManagedResources/BGNC/login_xipu_2.jpg rename to Assets/StreamingAssets/Res/login_xipu.png diff --git a/Assets/StreamingAssets/Res/login_xipu.png.meta b/Assets/StreamingAssets/Res/login_xipu.png.meta new file mode 100644 index 0000000000..08ea312ff6 --- /dev/null +++ b/Assets/StreamingAssets/Res/login_xipu.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7934cb466aa1a26478fd4e4cc0481567 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/logo_caohua.png b/Assets/StreamingAssets/Res/logo_caohua.png similarity index 100% rename from Assets/ManagedResources/BGNC/logo_caohua.png rename to Assets/StreamingAssets/Res/logo_caohua.png diff --git a/Assets/StreamingAssets/Res/logo_caohua.png.meta b/Assets/StreamingAssets/Res/logo_caohua.png.meta new file mode 100644 index 0000000000..32d0c68719 --- /dev/null +++ b/Assets/StreamingAssets/Res/logo_caohua.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f6f29e6dba7d7f48aab8fd3095de6dd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: