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
|
||||
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: []
|
||||
|
|
Before Width: | Height: | Size: 478 KiB After Width: | Height: | Size: 536 KiB |
|
@ -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: []
|
||||
|
|
Before Width: | Height: | Size: 504 KiB After Width: | Height: | Size: 569 KiB |
|
@ -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: []
|
||||
|
|
Before Width: | Height: | Size: 478 KiB After Width: | Height: | Size: 534 KiB |
|
@ -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: []
|
||||
|
|
|
@ -33,12 +33,10 @@ local _ConditionConfig = {
|
|||
local v2 = condition[2]
|
||||
local record = HardStageEventManager.GetRoundDamageRecord()
|
||||
if record then
|
||||
for key, value in pairs(record) do
|
||||
if key<=v1 and value[2]>=v2 then
|
||||
if record[v1] and record[v1] >= v2 then
|
||||
return 1
|
||||
end
|
||||
end
|
||||
end
|
||||
return 0
|
||||
end,
|
||||
--使用指定[a]系神将[b]名
|
||||
|
|
|
@ -82,20 +82,12 @@ function this.OnRecordDamage(atkRole,defRole,damage)
|
|||
end
|
||||
local curRound,maxRound=BattleLogic.GetCurRound()
|
||||
CurRound=curRound
|
||||
--如果进入下一回合,记录上一回合的伤害
|
||||
if CurRound==recordRound+1 then
|
||||
table.insert(recordRoundDamage,{recordRound,roundDamage})
|
||||
recordRound=CurRound
|
||||
end
|
||||
roundDamage=roundDamage+damage
|
||||
recordRoundDamage[CurRound] = roundDamage
|
||||
end
|
||||
|
||||
--获取回合伤害记录
|
||||
function this.GetRoundDamageRecord()
|
||||
--如果一回合就结束战斗了,就直接把记录的回合数伤害加进去
|
||||
if CurRound==1 then
|
||||
table.insert(recordRoundDamage,{recordRound,roundDamage})
|
||||
end
|
||||
return recordRoundDamage
|
||||
end
|
||||
|
||||
|
|
|
@ -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]
|
||||
|
|