Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Before Width: | Height: | Size: 511 KiB After Width: | Height: | Size: 576 KiB |
|
@ -92,6 +92,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites:
|
sprites:
|
||||||
|
@ -110,7 +121,7 @@ TextureImporter:
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
tessellationDetail: -1
|
tessellationDetail: -1
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 4e573b6e4940e6d4b9fa6f47f4a8ed98
|
spriteID: 891cc87e1bc9a21458e50101b7fb6511
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
|
|
Before Width: | Height: | Size: 478 KiB After Width: | Height: | Size: 536 KiB |
|
@ -92,6 +92,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites:
|
sprites:
|
||||||
|
@ -110,7 +121,7 @@ TextureImporter:
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
tessellationDetail: -1
|
tessellationDetail: -1
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 8c5c1ae8e87501240ab55d943c7e6da3
|
spriteID: 603690e89eebd5b41ad80b72e5b5e705
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
|
|
Before Width: | Height: | Size: 504 KiB After Width: | Height: | Size: 569 KiB |
|
@ -92,6 +92,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites:
|
sprites:
|
||||||
|
@ -110,7 +121,7 @@ TextureImporter:
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
tessellationDetail: -1
|
tessellationDetail: -1
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: 93826e21655d09e4e9b6d0125ae17cea
|
spriteID: cb38273cad21d3748a70dd6df3a36135
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
|
|
Before Width: | Height: | Size: 478 KiB After Width: | Height: | Size: 534 KiB |
|
@ -92,6 +92,17 @@ TextureImporter:
|
||||||
allowsAlphaSplitting: 0
|
allowsAlphaSplitting: 0
|
||||||
overridden: 1
|
overridden: 1
|
||||||
androidETC2FallbackOverride: 0
|
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:
|
spriteSheet:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
sprites:
|
sprites:
|
||||||
|
@ -110,7 +121,7 @@ TextureImporter:
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
tessellationDetail: -1
|
tessellationDetail: -1
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: c13b6d10d60b3554faf13cabdad57b0c
|
spriteID: 611e29aeaf40156449bc65df26a0da86
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
|
|
|
@ -452,17 +452,17 @@ function BattleLogic.BattleEnd(result)
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.BattleEnd, result)
|
BattleLogic.Event:DispatchEvent(BattleEventName.BattleEnd, result)
|
||||||
if hardStageId and hardStageId~=0 then
|
if hardStageId and hardStageId~=0 then
|
||||||
--获取精英副本 星级信息
|
--获取精英副本 星级信息
|
||||||
local hardStageConfig=ConfigManager.GetConfigData(ConfigName.HardStage,hardStageId)
|
local hardStageConfig=ConfigManager.GetConfigData(ConfigName.HardStage,hardStageId)
|
||||||
if hardStageConfig then
|
if hardStageConfig then
|
||||||
if hardStageConfig.ConditionValue then
|
if hardStageConfig.ConditionValue then
|
||||||
for i = 1, #hardStageConfig.ConditionValue do
|
for i = 1, #hardStageConfig.ConditionValue do
|
||||||
local harConfig = ConfigManager.GetConfigData(ConfigName.HardStageCondition,hardStageConfig.ConditionValue[i])
|
local harConfig = ConfigManager.GetConfigData(ConfigName.HardStageCondition,hardStageConfig.ConditionValue[i])
|
||||||
local v1=HardStageCondition.CheckCondition(harConfig.ConditionType,harConfig.ConditionValue)
|
local v1 = HardStageCondition.CheckCondition(harConfig.ConditionType,harConfig.ConditionValue)
|
||||||
table.insert(levelStarRecord,hardStageConfig.ConditionValue[i])
|
table.insert(levelStarRecord,hardStageConfig.ConditionValue[i])
|
||||||
table.insert(levelStarRecord,v1)
|
table.insert(levelStarRecord,v1)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 打印结果
|
-- 打印结果
|
||||||
|
|
|
@ -31,13 +31,11 @@ local _ConditionConfig = {
|
||||||
[4]=function(condition)
|
[4]=function(condition)
|
||||||
local v1 = condition[1]
|
local v1 = condition[1]
|
||||||
local v2 = condition[2]
|
local v2 = condition[2]
|
||||||
local record=HardStageEventManager.GetRoundDamageRecord()
|
local record = HardStageEventManager.GetRoundDamageRecord()
|
||||||
if record then
|
if record then
|
||||||
for key, value in pairs(record) do
|
if record[v1] and record[v1] >= v2 then
|
||||||
if key<=v1 and value[2]>=v2 then
|
return 1
|
||||||
return 1
|
end
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
return 0
|
return 0
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -79,23 +79,15 @@ end
|
||||||
function this.OnRecordDamage(atkRole,defRole,damage)
|
function this.OnRecordDamage(atkRole,defRole,damage)
|
||||||
if not atkRole or atkRole.camp==1 then
|
if not atkRole or atkRole.camp==1 then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local curRound,maxRound=BattleLogic.GetCurRound()
|
local curRound,maxRound=BattleLogic.GetCurRound()
|
||||||
CurRound=curRound
|
CurRound=curRound
|
||||||
--如果进入下一回合,记录上一回合的伤害
|
roundDamage=roundDamage+damage
|
||||||
if CurRound==recordRound+1 then
|
recordRoundDamage[CurRound] = roundDamage
|
||||||
table.insert(recordRoundDamage,{recordRound,roundDamage})
|
|
||||||
recordRound=CurRound
|
|
||||||
end
|
|
||||||
roundDamage=roundDamage+damage
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--获取回合伤害记录
|
--获取回合伤害记录
|
||||||
function this.GetRoundDamageRecord()
|
function this.GetRoundDamageRecord()
|
||||||
--如果一回合就结束战斗了,就直接把记录的回合数伤害加进去
|
|
||||||
if CurRound==1 then
|
|
||||||
table.insert(recordRoundDamage,{recordRound,roundDamage})
|
|
||||||
end
|
|
||||||
return recordRoundDamage
|
return recordRoundDamage
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -43,9 +43,9 @@ local UpdateBtnGMFunc = {
|
||||||
[BATTLE_TYPE.MONSTER_CAMP] = function()
|
[BATTLE_TYPE.MONSTER_CAMP] = function()
|
||||||
return SKIP_STATE.UNLOCK
|
return SKIP_STATE.UNLOCK
|
||||||
end,
|
end,
|
||||||
[BATTLE_TYPE.DAILY_CHALLENGE] = function()
|
-- [BATTLE_TYPE.DAILY_CHALLENGE] = function()
|
||||||
return SKIP_STATE.NOUSE, "日常副本战斗无法跳过!"
|
-- return SKIP_STATE.NOUSE, "日常副本战斗无法跳过!"
|
||||||
end,
|
-- end,
|
||||||
[BATTLE_TYPE.STORY_FIGHT] = function()
|
[BATTLE_TYPE.STORY_FIGHT] = function()
|
||||||
if not BattleManager.IsUnlockBattlePass() then
|
if not BattleManager.IsUnlockBattlePass() then
|
||||||
return SKIP_STATE.LOCK, Language[12237]
|
return SKIP_STATE.LOCK, Language[12237]
|
||||||
|
|