diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png index 1c188ab109..010a4f492a 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta index 7160a59279..75aa4d9cd6 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta @@ -92,6 +92,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: @@ -110,7 +121,7 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 4e573b6e4940e6d4b9fa6f47f4a8ed98 + spriteID: 891cc87e1bc9a21458e50101b7fb6511 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png index 271934fbb2..18b4bb246d 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta index 321a7d43a0..44891f6647 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta @@ -92,6 +92,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: @@ -110,7 +121,7 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 8c5c1ae8e87501240ab55d943c7e6da3 + spriteID: 603690e89eebd5b41ad80b72e5b5e705 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png index 1892f49755..a1a3294187 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta index 8b45048b8a..74d9524f05 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta @@ -92,6 +92,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: @@ -110,7 +121,7 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 93826e21655d09e4e9b6d0125ae17cea + spriteID: cb38273cad21d3748a70dd6df3a36135 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png index 8724037b8b..f258e0caf3 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png and b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta index 029a360bd3..5760f4d68b 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner04_zh.png.meta @@ -92,6 +92,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - 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: @@ -110,7 +121,7 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: c13b6d10d60b3554faf13cabdad57b0c + spriteID: 611e29aeaf40156449bc65df26a0da86 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 97fd061a8c..f5144eafe3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -452,17 +452,17 @@ function BattleLogic.BattleEnd(result) BattleLogic.Event:DispatchEvent(BattleEventName.BattleEnd, result) if hardStageId and hardStageId~=0 then --获取精英副本 星级信息 - local hardStageConfig=ConfigManager.GetConfigData(ConfigName.HardStage,hardStageId) - if hardStageConfig then - if hardStageConfig.ConditionValue then - for i = 1, #hardStageConfig.ConditionValue do - local harConfig = ConfigManager.GetConfigData(ConfigName.HardStageCondition,hardStageConfig.ConditionValue[i]) - local v1=HardStageCondition.CheckCondition(harConfig.ConditionType,harConfig.ConditionValue) - table.insert(levelStarRecord,hardStageConfig.ConditionValue[i]) - table.insert(levelStarRecord,v1) - end + local hardStageConfig=ConfigManager.GetConfigData(ConfigName.HardStage,hardStageId) + if hardStageConfig then + if hardStageConfig.ConditionValue then + for i = 1, #hardStageConfig.ConditionValue do + local harConfig = ConfigManager.GetConfigData(ConfigName.HardStageCondition,hardStageConfig.ConditionValue[i]) + local v1 = HardStageCondition.CheckCondition(harConfig.ConditionType,harConfig.ConditionValue) + table.insert(levelStarRecord,hardStageConfig.ConditionValue[i]) + table.insert(levelStarRecord,v1) + end + end end - end end -- 打印结果 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua index 2c8b306fcf..2a42fc055d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua @@ -31,13 +31,11 @@ local _ConditionConfig = { [4]=function(condition) local v1 = condition[1] local v2 = condition[2] - local record=HardStageEventManager.GetRoundDamageRecord() + local record = HardStageEventManager.GetRoundDamageRecord() if record then - for key, value in pairs(record) do - if key<=v1 and value[2]>=v2 then - return 1 - end - end + if record[v1] and record[v1] >= v2 then + return 1 + end end return 0 end, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua index f85e856df1..b70d8db2e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua @@ -79,23 +79,15 @@ end function this.OnRecordDamage(atkRole,defRole,damage) if not atkRole or atkRole.camp==1 then return - end - local curRound,maxRound=BattleLogic.GetCurRound() - CurRound=curRound - --如果进入下一回合,记录上一回合的伤害 - if CurRound==recordRound+1 then - table.insert(recordRoundDamage,{recordRound,roundDamage}) - recordRound=CurRound - end - roundDamage=roundDamage+damage + end + local curRound,maxRound=BattleLogic.GetCurRound() + CurRound=curRound + roundDamage=roundDamage+damage + recordRoundDamage[CurRound] = roundDamage end --获取回合伤害记录 function this.GetRoundDamageRecord() - --如果一回合就结束战斗了,就直接把记录的回合数伤害加进去 - if CurRound==1 then - table.insert(recordRoundDamage,{recordRound,roundDamage}) - end return recordRoundDamage end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 734a3eee6b..d31fe0609b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -43,9 +43,9 @@ local UpdateBtnGMFunc = { [BATTLE_TYPE.MONSTER_CAMP] = function() return SKIP_STATE.UNLOCK end, - [BATTLE_TYPE.DAILY_CHALLENGE] = function() - return SKIP_STATE.NOUSE, "日常副本战斗无法跳过!" - end, + -- [BATTLE_TYPE.DAILY_CHALLENGE] = function() + -- return SKIP_STATE.NOUSE, "日常副本战斗无法跳过!" + -- end, [BATTLE_TYPE.STORY_FIGHT] = function() if not BattleManager.IsUnlockBattlePass() then return SKIP_STATE.LOCK, Language[12237]