From 0054f5e6460e8f54841b1cfb16d086f75793b566 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 24 Dec 2020 10:37:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=8D=81?= =?UTF-8?q?=E7=BB=9D=E9=98=B5=E6=88=98=E6=96=97=E7=BB=93=E6=9D=9F=E5=90=8E?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=87=B3=E6=8C=91=E6=88=98=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E8=80=8C=E9=9D=9E=E7=BC=96=E9=98=9F=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=88=E7=BC=96=E9=98=9F=E7=95=8C=E9=9D=A2=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=89=A9=E4=BD=99=E6=8C=91=E6=88=98=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=BD=93=E5=89=8D=E7=BB=9D=E9=98=B5=E6=8E=92?= =?UTF-8?q?=E5=90=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont.meta => ShengXingYouLi.meta} | 2 +- .../ArtFont.meta => XiangYaoDuoBao.meta} | 2 +- .../skill/Audio_100912bgj_exskill_01.mp3.meta | 22 ----- .../skill/Audio_100912bgj_exskill_02.mp3.meta | 22 ----- .../EffectResUI/SheJiDaDian/Prefab/UI.meta | 8 -- .../Effects/Model/Materials.meta | 8 -- .../Icon/Item/r_xinjianglaixi_chou.png.meta | 88 ------------------- .../Item/r_xinjianglaixi_duihuan.png.meta | 88 ------------------- .../PublicArtRes/Models/Materials.meta | 8 -- .../Formation/View/GuildDeathPosFormation.lua | 3 +- Assets/StreamingAssets/Android.meta | 8 -- 11 files changed, 4 insertions(+), 255 deletions(-) rename Assets/ManagedResources/Atlas/DynamicActivityAtlas/{ShengXingYouLi/ArtFont.meta => ShengXingYouLi.meta} (77%) rename Assets/ManagedResources/Atlas/DynamicActivityAtlas/{XiangYaoDuoBao/ArtFont.meta => XiangYaoDuoBao.meta} (77%) delete mode 100644 Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta delete mode 100644 Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta delete mode 100644 Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta delete mode 100644 Assets/ManagedResources/Effects/Model/Materials.meta delete mode 100644 Assets/ManagedResources/Icon/Item/r_xinjianglaixi_chou.png.meta delete mode 100644 Assets/ManagedResources/Icon/Item/r_xinjianglaixi_duihuan.png.meta delete mode 100644 Assets/ManagedResources/PublicArtRes/Models/Materials.meta delete mode 100644 Assets/StreamingAssets/Android.meta diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta similarity index 77% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta rename to Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta index 4241199926..8745c534e3 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8565114765606a47bb956272df0d13e +guid: 814a374fa5248bc4f92e382b5827589b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta similarity index 77% rename from Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta rename to Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta index 6160cfb59a..cb21bda1d5 100644 --- a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48cee46354d3dc145af2bf55ced3fde2 +guid: 095aa8f76340f854aa387f03d93db7d7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta deleted file mode 100644 index b53fe0b3a6..0000000000 --- a/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 696df8709a12455479a651a73fe7a03b -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta deleted file mode 100644 index 3095c03d09..0000000000 --- a/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: cca5442cd3995a846bb82edb43d34dc5 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta b/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta deleted file mode 100644 index c35a8a253f..0000000000 --- a/Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 76d90ce45026b3c45928728309c9c5e2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/ManagedResources/Effects/Model/Materials.meta deleted file mode 100644 index 85c619cb77..0000000000 --- a/Assets/ManagedResources/Effects/Model/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 70e7feb15403e214f801e51b8b4e0461 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_chou.png.meta b/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_chou.png.meta deleted file mode 100644 index 0b655a6ac7..0000000000 --- a/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_chou.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 85042cc6ab279fd45aff45e63617ba3a -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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 1c350d9a529efe4448048c19c8121d99 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_duihuan.png.meta b/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_duihuan.png.meta deleted file mode 100644 index a326e45ad9..0000000000 --- a/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_duihuan.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: fe36762df3bdd83448a342d51008b637 -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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 7c6970e543acbdb46b5afba88ad8773d - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta b/Assets/ManagedResources/PublicArtRes/Models/Materials.meta deleted file mode 100644 index 345c3c310a..0000000000 --- a/Assets/ManagedResources/PublicArtRes/Models/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc22e9329030c8b499e0d1d7081055fd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua index 72da928655..0cf3abbf75 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/GuildDeathPosFormation.lua @@ -54,7 +54,8 @@ function this.On_Btn2_Click() DeathPosManager.drop=msg.drop DeathPosManager.damage=msg.damage DeathPosManager.historyMax=msg.historyMax - UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DEATH_POS, function() + this.OnCloseBtnClick() + UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DEATH_POS, function() DeathPosManager.battleTime=DeathPosManager.battleTime-1 if DeathPosManager.battleTime<=0 then DeathPosManager.battleTime=0 diff --git a/Assets/StreamingAssets/Android.meta b/Assets/StreamingAssets/Android.meta deleted file mode 100644 index 52a0ae7f57..0000000000 --- a/Assets/StreamingAssets/Android.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cdf11c4964e54cd46a5196a33f53470a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: