diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hsmw_00010_attack_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hsmw_00010_attack_02.mp3 new file mode 100644 index 0000000000..7a5abf62e8 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hsmw_00010_attack_02.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hsmw_00010_attack_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hsmw_00010_attack_02.mp3.meta new file mode 100644 index 0000000000..bdc0353e89 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_hsmw_00010_attack_02.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 754f484056fde834f8f00d538de0b559 +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_Effect_c_pxps_00024_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_pxps_00024_attack_01.mp3 new file mode 100644 index 0000000000..9e9a8d1091 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_pxps_00024_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_pxps_00024_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_pxps_00024_attack_01.mp3.meta new file mode 100644 index 0000000000..a8f24d857b --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_pxps_00024_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e106c4cdd62981e4e8d52e5f795f0f0d +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_Effect_c_sjnn_00012_attack_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_sjnn_00012_attack_02.mp3 new file mode 100644 index 0000000000..7c9ef1a496 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_sjnn_00012_attack_02.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_sjnn_00012_attack_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_sjnn_00012_attack_02.mp3.meta new file mode 100644 index 0000000000..858df6f1a7 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_sjnn_00012_attack_02.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: dbf732bf519d9254e98561340f954007 +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_Effect_c_syf_0016_t3_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_01.mp3 new file mode 100644 index 0000000000..b87b23fb40 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_01.mp3.meta new file mode 100644 index 0000000000..53e6b94338 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b84a5b690a940c24a8b393c15f1b1f37 +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_Effect_c_syf_0016_t3_attack_02.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_02.mp3 new file mode 100644 index 0000000000..6069c08ca8 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_02.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_02.mp3.meta new file mode 100644 index 0000000000..e445d7955c --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_syf_0016_t3_attack_02.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b5ba28924847a914f9ec864e69a03beb +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_c_chdr_00030_t3_attack.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_t3_attack.mp3 new file mode 100644 index 0000000000..e2f5fe28b5 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_t3_attack.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_t3_attack.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_t3_attack.mp3.meta new file mode 100644 index 0000000000..79d8cbdf47 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_chdr_00030_t3_attack.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fdadeee7eb3511c499de5c4555bbc90e +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_c_cy_daoguangjizhong.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_daoguangjizhong.mp3 new file mode 100644 index 0000000000..4df8b368c9 Binary files /dev/null and b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_daoguangjizhong.mp3 differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_daoguangjizhong.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_daoguangjizhong.mp3.meta new file mode 100644 index 0000000000..a407ca096e --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_c_cy_daoguangjizhong.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8f3bec0ed20c4eb479d3fce063b623b8 +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/Icons/r_fb_90015.png b/Assets/ManagedResources/Icons/r_fb_90015.png index d259c557ec..6603e5945d 100644 Binary files a/Assets/ManagedResources/Icons/r_fb_90015.png and b/Assets/ManagedResources/Icons/r_fb_90015.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90035.png b/Assets/ManagedResources/Icons/r_fb_90035.png index ee88ee33f0..99e4271053 100644 Binary files a/Assets/ManagedResources/Icons/r_fb_90035.png and b/Assets/ManagedResources/Icons/r_fb_90035.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90045.png b/Assets/ManagedResources/Icons/r_fb_90045.png new file mode 100644 index 0000000000..3b817688c6 Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90045.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90045.png.meta b/Assets/ManagedResources/Icons/r_fb_90045.png.meta new file mode 100644 index 0000000000..d77d1990aa --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90045.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5ed7b35a4664d94489b016d45e3d093c +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: dfdf35accea578848bed424cafe81d15 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua index 40ad6210fd..99f70ac272 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Recruit.lua @@ -38,7 +38,7 @@ function this:BtnClickEvent() if curSelectHero then --LogError("monsterData.sortId,curSelectHero.dynamicId "..monsterData.sortId.." "..curSelectHero.id) NetManager.HeroNodeRequest(monsterData.sortId,curSelectHero.id,function (msg) - LogError("#msg.drop.Hero "..#msg.drop.Hero) + -- LogError("#msg.drop.Hero "..#msg.drop.Hero) if msg.drop and msg.drop.Hero and msg.drop.Hero[1] then ExpeditionManager.UpdateHeroDatas(msg.drop.Hero[1]) end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua index c2ccedb62a..df3cbc3f2f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua @@ -129,8 +129,11 @@ function this.GetAllFormationHeroId() local index = 1 for i, team in pairs(this.formationList) do for j = 1, #team.teamHeroInfos do - list[team.teamHeroInfos[j].heroId] = index - index = index + 1 + -- 加空判断避免不知名错误 + if team and team.teamHeroInfos[j] then + list[team.teamHeroInfos[j].heroId] = index + index = index + 1 + end end end return list diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index f097d0480b..6f6689e0d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -277,7 +277,10 @@ function this.RefreshFormation() this.choosedList ={} for j = 1, #curFormation.teamHeroInfos do local teamInfo = curFormation.teamHeroInfos[j] - table.insert(this.choosedList, {heroId =teamInfo.heroId,position=teamInfo.position}) + -- 加空判断避免不知名错误 + if teamInfo then + table.insert(this.choosedList, {heroId =teamInfo.heroId,position=teamInfo.position}) + end end this.order = #this.choosedList diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index e85ab1cc82..e685a07e02 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -97,10 +97,10 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function RankingSingleListPanel:OnShow() - local asda = {} - this.scrollView:SetData(asda,function(index,root) - this.ShowTrialInfo(root,asda[index],nil) - end) + -- local asda = {} + -- this.scrollView:SetData(asda,function(index,root) + -- this.ShowTrialInfo(root,asda[index],nil) + -- end) end --界面关闭时调用(用于子类重写) diff --git a/data_execl/base_data/AudioConfig.xlsx b/data_execl/base_data/AudioConfig.xlsx index e512d04fbf..2de3fc1385 100644 Binary files a/data_execl/base_data/AudioConfig.xlsx and b/data_execl/base_data/AudioConfig.xlsx differ