diff --git a/Assets/ManagedResources/Audio/BGM/BGM_019.mp3 b/Assets/ManagedResources/Audio/BGM/BGM_019.mp3 index 159dcc3c99..cb9229f6eb 100644 Binary files a/Assets/ManagedResources/Audio/BGM/BGM_019.mp3 and b/Assets/ManagedResources/Audio/BGM/BGM_019.mp3 differ diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3 b/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3 new file mode 100644 index 0000000000..bede44b1d8 Binary files /dev/null and b/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_1.wav.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3.meta similarity index 75% rename from Assets/ManagedResources/Audio/UI/voice/bgm_story_2_1.wav.meta rename to Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3.meta index 7ee500acd7..4c756578f1 100644 --- a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_1.wav.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_1_1.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6b8a26dd8129bc84da65a093413125bb +guid: 8021993d376a45142a42a1092e3ad2f6 AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: lz4/audio/ui/voice/bgm_story_2_1 - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3 b/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3 new file mode 100644 index 0000000000..0f3d2b5625 Binary files /dev/null and b/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_1.wav.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3.meta similarity index 75% rename from Assets/ManagedResources/Audio/UI/voice/bgm_story_1_1.wav.meta rename to Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3.meta index 6f9e7a2bff..a9143ce180 100644 --- a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_1.wav.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_1_2.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 22073f83497e11448a02cfa30f588190 +guid: 91e7dc1d7e6cc844492ef0230caa5b0f AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: lz4/audio/ui/voice/bgm_story_1_1 - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3 b/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3 new file mode 100644 index 0000000000..cd58604b12 Binary files /dev/null and b/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_2.wav.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3.meta similarity index 75% rename from Assets/ManagedResources/Audio/UI/voice/bgm_story_2_2.wav.meta rename to Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3.meta index 0f2bd2d8cf..e614cfcef4 100644 --- a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_2.wav.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_2_1.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: edf73062a0b7a3c4eba2030ab5f8e75f +guid: 31d2a1023547f684ab123fc5e03b586b AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: lz4/audio/ui/voice/bgm_story_2_2 - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3 b/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3 new file mode 100644 index 0000000000..7e8db1c65b Binary files /dev/null and b/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3 differ diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_2.wav.meta b/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3.meta similarity index 75% rename from Assets/ManagedResources/Audio/UI/voice/bgm_story_1_2.wav.meta rename to Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3.meta index 03d7747671..4e0f0d2b14 100644 --- a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_2.wav.meta +++ b/Assets/ManagedResources/Audio/BGM/bgm_story_2_2.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d007d7a9d9e962e458695173c7cbb86d +guid: 78f3f89ddf1d6dd4e8e9f50b73f36812 AudioImporter: externalObjects: {} serializedVersion: 6 @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: lz4/audio/ui/voice/bgm_story_1_2 - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_1.wav b/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_1.wav deleted file mode 100644 index 8ff1cead05..0000000000 Binary files a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_1.wav and /dev/null differ diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_2.wav b/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_2.wav deleted file mode 100644 index 7a596dcebe..0000000000 Binary files a/Assets/ManagedResources/Audio/UI/voice/bgm_story_1_2.wav and /dev/null differ diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_1.wav b/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_1.wav deleted file mode 100644 index 5c5e538e44..0000000000 Binary files a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_1.wav and /dev/null differ diff --git a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_2.wav b/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_2.wav deleted file mode 100644 index 82b709e92a..0000000000 Binary files a/Assets/ManagedResources/Audio/UI/voice/bgm_story_2_2.wav and /dev/null differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta index 866c6a3c71..f409e6c2ca 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/l_mrlb_banner1_zi_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta index d7db48cbbd..d7ec076f55 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_1_zi_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -74,7 +74,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -85,7 +85,7 @@ TextureImporter: buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 12 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta index c03619a35b..8a4500d936 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_2_zi_zh.png.meta @@ -41,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 2 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -74,7 +74,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -85,7 +85,7 @@ TextureImporter: buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 12 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta index 2b3a8f1095..87a2c64d8f 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_3_zi_zh.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -73,23 +73,23 @@ TextureImporter: buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 12 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta index e68fbeaa94..24f79f36fb 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_4_zi_zh.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -73,23 +73,23 @@ TextureImporter: buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 12 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta index 927053b2be..54f808d10b 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_richang_banner_5_zi_zh.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -73,23 +73,23 @@ TextureImporter: buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 12 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 33 + textureFormat: 57 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android diff --git a/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_renwuchuxian_anim.anim b/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_renwuchuxian_anim.anim index fe7c256d74..9fcfd31728 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_renwuchuxian_anim.anim +++ b/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_renwuchuxian_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_effect_SupremeHeroPopup_renwuchuxian + m_Name: UI_effect_SupremeHeroPopup_renwuchuxian_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_zhuzi_anim.anim b/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_zhuzi_anim.anim index 9c920a6273..b748b85ca1 100644 --- a/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_zhuzi_anim.anim +++ b/Assets/ManagedResources/Effects/Animation/UI_effect_SupremeHeroPopup_zhuzi_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_effect_SupremeHeroPopup_zhuzi + m_Name: UI_effect_SupremeHeroPopup_zhuzi_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab index 9e26da35db..3f7c26a9e7 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab @@ -8448,7 +8448,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.4, y: -37.7} + m_AnchoredPosition: {x: -2.4, y: -59} m_SizeDelta: {x: 113, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7600987953307217645 @@ -8910,7 +8910,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.4, y: -22.9} + m_AnchoredPosition: {x: -2.4, y: -59} m_SizeDelta: {x: 113, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6652967392251576279 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 1cc7acb1b8..e3f14d1ed6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -259,7 +259,7 @@ function this.SetComPShowState(type) this.guildDeathPos:SetActive(type == 4) this.guildTranscript:SetActive(type == 6) this.tasuilingxiao:SetActive(type == 7) - this.FightLevel:SetActive(type == 8) + -- this.FightLevel:SetActive(type == 8) if type == 7 then this.noRewardText:SetActive(#itemDataList < 1) end