挑战副本优化

yuanshuai 2022-04-25 18:20:53 +08:00
parent f49bb38f8f
commit bf52645eb7
12 changed files with 331 additions and 22 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 0184687da471c2d4cbf6161df42c389c
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: 2
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
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: []
outline: []
physicsShape: []
bones: []
spriteID: a9bb5358cc0633945a39ca4c3962b4a6
vertices: []
indices:
edges: []
weights: []
spritePackingTag: CarbonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 9a599ea7dfd1a8f4b9779be26b7df2b6
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: 2
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: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 56
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
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: []
outline: []
physicsShape: []
bones: []
spriteID: 5d9360e0671eb4b43891183317d5dfa2
vertices: []
indices:
edges: []
weights: []
spritePackingTag: CarbonAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -739,7 +739,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -323.0005, y: 0} m_AnchoredPosition: {x: -345, y: 0}
m_SizeDelta: {x: 165, y: 165} m_SizeDelta: {x: 165, y: 165}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6901831702187834385 --- !u!222 &6901831702187834385
@ -1349,7 +1349,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -29.6, y: -3.8} m_AnchoredPosition: {x: -72, y: -3.8}
m_SizeDelta: {x: 386.2, y: 137.7} m_SizeDelta: {x: 386.2, y: 137.7}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6899759931426735578 --- !u!114 &6899759931426735578

View File

@ -493,6 +493,9 @@ CHALLENGERESPONSE = protobuf.Descriptor();
CHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); CHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CHALLENGERESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor(); CHALLENGERESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
CHALLENGERESPONSE_RESULT_FIELD = protobuf.FieldDescriptor(); CHALLENGERESPONSE_RESULT_FIELD = protobuf.FieldDescriptor();
CHALLENGERESPONSE_TYPE_FIELD = protobuf.FieldDescriptor();
CHALLENGERESPONSE_PERCENTREWARD_FIELD = protobuf.FieldDescriptor();
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD = protobuf.FieldDescriptor();
GETSOMEACTIVITYINFOREQUEST = protobuf.Descriptor(); GETSOMEACTIVITYINFOREQUEST = protobuf.Descriptor();
GETSOMEACTIVITYINFOREQUEST_ID_FIELD = protobuf.FieldDescriptor(); GETSOMEACTIVITYINFOREQUEST_ID_FIELD = protobuf.FieldDescriptor();
GETSOMEACTITITYINFORESPONE = protobuf.Descriptor(); GETSOMEACTITITYINFORESPONE = protobuf.Descriptor();
@ -5235,11 +5238,41 @@ CHALLENGERESPONSE_RESULT_FIELD.default_value = 0
CHALLENGERESPONSE_RESULT_FIELD.type = 5 CHALLENGERESPONSE_RESULT_FIELD.type = 5
CHALLENGERESPONSE_RESULT_FIELD.cpp_type = 1 CHALLENGERESPONSE_RESULT_FIELD.cpp_type = 1
CHALLENGERESPONSE_TYPE_FIELD.name = "type"
CHALLENGERESPONSE_TYPE_FIELD.full_name = ".rpc.protocols.ChallengeResponse.type"
CHALLENGERESPONSE_TYPE_FIELD.number = 4
CHALLENGERESPONSE_TYPE_FIELD.index = 3
CHALLENGERESPONSE_TYPE_FIELD.label = 1
CHALLENGERESPONSE_TYPE_FIELD.has_default_value = false
CHALLENGERESPONSE_TYPE_FIELD.default_value = 0
CHALLENGERESPONSE_TYPE_FIELD.type = 5
CHALLENGERESPONSE_TYPE_FIELD.cpp_type = 1
CHALLENGERESPONSE_PERCENTREWARD_FIELD.name = "percentReward"
CHALLENGERESPONSE_PERCENTREWARD_FIELD.full_name = ".rpc.protocols.ChallengeResponse.percentReward"
CHALLENGERESPONSE_PERCENTREWARD_FIELD.number = 5
CHALLENGERESPONSE_PERCENTREWARD_FIELD.index = 4
CHALLENGERESPONSE_PERCENTREWARD_FIELD.label = 1
CHALLENGERESPONSE_PERCENTREWARD_FIELD.has_default_value = false
CHALLENGERESPONSE_PERCENTREWARD_FIELD.default_value = 0
CHALLENGERESPONSE_PERCENTREWARD_FIELD.type = 5
CHALLENGERESPONSE_PERCENTREWARD_FIELD.cpp_type = 1
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.name = "lossBloodOrTimes"
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.full_name = ".rpc.protocols.ChallengeResponse.lossBloodOrTimes"
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.number = 6
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.index = 5
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.label = 1
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.has_default_value = false
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.default_value = 0
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.type = 3
CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD.cpp_type = 2
CHALLENGERESPONSE.name = "ChallengeResponse" CHALLENGERESPONSE.name = "ChallengeResponse"
CHALLENGERESPONSE.full_name = ".rpc.protocols.ChallengeResponse" CHALLENGERESPONSE.full_name = ".rpc.protocols.ChallengeResponse"
CHALLENGERESPONSE.nested_types = {} CHALLENGERESPONSE.nested_types = {}
CHALLENGERESPONSE.enum_types = {} CHALLENGERESPONSE.enum_types = {}
CHALLENGERESPONSE.fields = {CHALLENGERESPONSE_DROP_FIELD, CHALLENGERESPONSE_FIGHTDATA_FIELD, CHALLENGERESPONSE_RESULT_FIELD} CHALLENGERESPONSE.fields = {CHALLENGERESPONSE_DROP_FIELD, CHALLENGERESPONSE_FIGHTDATA_FIELD, CHALLENGERESPONSE_RESULT_FIELD, CHALLENGERESPONSE_TYPE_FIELD, CHALLENGERESPONSE_PERCENTREWARD_FIELD, CHALLENGERESPONSE_LOSSBLOODORTIMES_FIELD}
CHALLENGERESPONSE.is_extendable = false CHALLENGERESPONSE.is_extendable = false
CHALLENGERESPONSE.extensions = {} CHALLENGERESPONSE.extensions = {}
GETSOMEACTIVITYINFOREQUEST_ID_FIELD.name = "id" GETSOMEACTIVITYINFOREQUEST_ID_FIELD.name = "id"

View File

@ -601,12 +601,8 @@ function this.ShowBattleResult(result, msg)
elseif fightType == BATTLE_TYPE.LINGMAIMIJING then elseif fightType == BATTLE_TYPE.LINGMAIMIJING then
this:ClosePanel() this:ClosePanel()
elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.CHALLENG_COPY_1 or BattleManager.GetLastBattleType() == BATTLE_TYPE.CHALLENG_COPY_2 then elseif BattleManager.GetLastBattleType() == BATTLE_TYPE.CHALLENG_COPY_1 or BattleManager.GetLastBattleType() == BATTLE_TYPE.CHALLENG_COPY_2 then
if this.externalData==0 then --this.externalData后端传的战斗结果 --只显示胜利界面
local haveRecord = BattleRecordManager.isHaveRecord() UIManager.OpenPanel(UIName.BattleWinPopup, this, isBack, fightType, this.lastBattleResult)
UIManager.OpenPanel(UIName.BattleFailPopup, this, haveRecord,nil,fightType)
else
this:ClosePanel()
end
else else
LogRed("result:"..tostring(result)) LogRed("result:"..tostring(result))
if result == 0 then -- 失败 if result == 0 then -- 失败

View File

@ -1112,4 +1112,16 @@ function this.CheckCopyOpenState(copyId)
return this.challengeCopyDataTable[copyId].overTime==1 return this.challengeCopyDataTable[copyId].overTime==1
end end
--获取战斗结束后信息(拼接)
function this.GetBattleResult()
local data = {}
if this.battleResult.type==1 then
data[1] = "<color=#F9E7D3>奖励加成:</color> <color=#3DE181>"..(this.battleResult.percentReward/100).."%</color>\n<color=#AE7B20>("..this.battleResult.lossBloodOrTimes.."回合)</color>"
else
data[1] = "<color=#F9E7D3>奖励加成:</color> <color=#3DE181>"..(this.battleResult.percentReward/100).."%</color>\n<color=#AE7B20>(总伤害:"..this.battleResult.lossBloodOrTimes..")</color>"
end
return data
end
return this return this

View File

@ -54,7 +54,6 @@ function ChallengeCopyPanel:InitComponent()
this.backBtn=Util.GetGameObject(this.panel,"BackBtn") this.backBtn=Util.GetGameObject(this.panel,"BackBtn")
this.helpBtn= Util.GetGameObject(this.panel, "HelpBtn") this.helpBtn= Util.GetGameObject(this.panel, "HelpBtn")
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
--滚动条 --滚动条
this.pre = Util.GetGameObject(this.panel, "Scroll/Pre") this.pre = Util.GetGameObject(this.panel, "Scroll/Pre")
this.scroll = Util.GetGameObject(this.panel, "Scroll") this.scroll = Util.GetGameObject(this.panel, "Scroll")
@ -149,6 +148,8 @@ function this.RefreshShow(i)
local challengeStageId=CarbonManager.challengeCopyDataTable[carbonIndex].currentFloor local challengeStageId=CarbonManager.challengeCopyDataTable[carbonIndex].currentFloor
if challengeStageId>0 then if challengeStageId>0 then
fightIndex= ConfigManager.GetConfigData(ConfigName.ChallengeStage,challengeStageId).Section fightIndex= ConfigManager.GetConfigData(ConfigName.ChallengeStage,challengeStageId).Section
else
fightIndex=1
end end
curData={} curData={}
curData=ConfigManager.GetAllConfigsDataByKey(ConfigName.ChallengeStage,"Chapter",i) curData=ConfigManager.GetAllConfigsDataByKey(ConfigName.ChallengeStage,"Chapter",i)
@ -176,7 +177,7 @@ function this.SetData(root, data)
local bgQuality=Util.GetGameObject(root,"Bg"):GetComponent("Image") local bgQuality=Util.GetGameObject(root,"Bg"):GetComponent("Image")
local title=Util.GetGameObject(root,"Title"):GetComponent("Image") local title=Util.GetGameObject(root,"Title"):GetComponent("Image")
local titleText=Util.GetGameObject(root,"TitleText"):GetComponent("Text") local titleText=Util.GetGameObject(root,"TitleText"):GetComponent("Text")
local reward=Util.GetGameObject(root,"Reward") local rewardGrid=Util.GetGameObject(root,"Reward")
local tip=Util.GetGameObject(root,"Tip"):GetComponent("Text") local tip=Util.GetGameObject(root,"Tip"):GetComponent("Text")
local power=Util.GetGameObject(root,"powerBtn/value"):GetComponent("Text") local power=Util.GetGameObject(root,"powerBtn/value"):GetComponent("Text")
power.transform.parent.gameObject:SetActive(false) power.transform.parent.gameObject:SetActive(false)
@ -194,11 +195,26 @@ function this.SetData(root, data)
bgQuality.sprite=this.spLoader:LoadSprite(qualityBg[1].b) bgQuality.sprite=this.spLoader:LoadSprite(qualityBg[1].b)
type=CarbonManager.CheckChallengeCopyId(data.Chapter,data.NextLevel) type=CarbonManager.CheckChallengeCopyId(data.Chapter,data.NextLevel)
local showReward={} local showReward={}
ConnectTable(showReward,data.FixedReward)
ConnectTable(showReward,data.PassReward) ConnectTable(showReward,data.PassReward)
if type~=2 then if type~=2 then
ConnectTable(showReward,data.VictoryReward) ConnectTable(showReward,data.VictoryReward)
end end
ResetItemView(root,reward.transform,itemList,3,0.9,orginLayer,false,showReward) ResetItemView(root,rewardGrid.transform,itemList,3,0.9,orginLayer,false,showReward)
for i = 0, 2 do
local item=rewardGrid.transform:GetChild(i)
local image = Util.GetGameObject(item,"PreciousShow")
image.gameObject:SetActive(true)
Util.GetGameObject(image, "Text").gameObject:SetActive(false)
if i==0 then
image:GetComponent("Image").sprite = this.spLoader:LoadSprite("x_xianyuan_baodijiaobiao_zh")
elseif i==1 then
image:GetComponent("Image").sprite = this.spLoader:LoadSprite("x_xianyuan_jindujiaobiao_zh")
else
image:GetComponent("Image").sprite = this.spLoader:LoadSprite("x_xianyuan_shoucijiaobiao_zh")
end
end
--解锁状态 --解锁状态
local _lv=0 --等级 local _lv=0 --等级

View File

@ -59,6 +59,7 @@ end
function this.StartFight() function this.StartFight()
NetManager.ChallengeCopyRequest(this.data.Chapter,1,this.data .Id,function(msg) NetManager.ChallengeCopyRequest(this.data.Chapter,1,this.data .Id,function(msg)
LogGreen("挑战副本战斗返回:") LogGreen("挑战副本战斗返回:")
this.root:ClosePanel()
local fightData = BattleManager.GetBattleServerData(msg) local fightData = BattleManager.GetBattleServerData(msg)
local battleType local battleType
if this.data.Chapter==1 then if this.data.Chapter==1 then
@ -66,16 +67,13 @@ function this.StartFight()
else else
battleType=BATTLE_TYPE.CHALLENG_COPY_2 battleType=BATTLE_TYPE.CHALLENG_COPY_2
end end
local battlePanel= UIManager.OpenPanel(UIName.BattlePanel, fightData, battleType , function() CarbonManager.battleResult = msg
LogGreen("222222战斗结果"..msg.result) UIManager.OpenPanel(UIName.BattlePanel, fightData, battleType)
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1)
this.root:ClosePanel()
end)
battlePanel:SetExternalData(msg.result)
if msg.result==1 then if msg.result==1 then
CarbonManager.UpdateChallengeCopyFloor(this.data.Chapter) CarbonManager.UpdateChallengeCopyFloor(this.data.Chapter)
end end
PrivilegeManager.RefreshPrivilegeUsedTimes(this.data.PivilegeID[2],1) PrivilegeManager.RefreshPrivilegeUsedTimes(this.data.PivilegeID[2],1)
end) end)
end end

View File

@ -55,10 +55,9 @@ function BattleWinPopup:NextStep()
this.ShowBattleResultByFourElement(m_battleResult.drop) this.ShowBattleResultByFourElement(m_battleResult.drop)
elseif m_fightType == BATTLE_TYPE.EXECUTE_FIGHT then -- 猎妖之路 elseif m_fightType == BATTLE_TYPE.EXECUTE_FIGHT then -- 猎妖之路
this.ShowBattleResultByExpedition(m_battleResult.drop) this.ShowBattleResultByExpedition(m_battleResult.drop)
elseif m_fightType == BATTLE_TYPE.DAILY_CHALLENGE elseif m_fightType == BATTLE_TYPE.DAILY_CHALLENGE-- 日常副本
or m_fightType == BATTLE_TYPE.XUAN_YUAN_MIRROR or m_fightType == BATTLE_TYPE.XUAN_YUAN_MIRROR
or m_fightType == BATTLE_TYPE.TRIAL_FIGHT -- 日常副本 or m_fightType == BATTLE_TYPE.TRIAL_FIGHT then
or m_fightType == BATTLE_TYPE.CHALLENG_COPY_2 then
m_battlePanel:ClosePanel() self:ClosePanel(m_battleResult.drop) m_battlePanel:ClosePanel() self:ClosePanel(m_battleResult.drop)
elseif m_fightType == BATTLE_TYPE.GUILD_CAR_DELAY then -- 车迟 elseif m_fightType == BATTLE_TYPE.GUILD_CAR_DELAY then -- 车迟
this.ShowBattleResultByCarDeleayType(m_battleResult.drop) this.ShowBattleResultByCarDeleayType(m_battleResult.drop)
@ -74,6 +73,8 @@ function BattleWinPopup:NextStep()
this.ShowBattleResultByEndless() this.ShowBattleResultByEndless()
elseif m_fightType == BATTLE_TYPE.QIJIE_FIGHT then--七界试炼战斗 elseif m_fightType == BATTLE_TYPE.QIJIE_FIGHT then--七界试炼战斗
this.ShowBattleResultByQiJie() this.ShowBattleResultByQiJie()
elseif m_fightType == BATTLE_TYPE.CHALLENG_COPY_1 or m_fightType == BATTLE_TYPE.CHALLENG_COPY_2 then
this.ShowBattleResultByChallengeCopy()
--新回放功能 --新回放功能
elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then
if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗 if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗
@ -145,6 +146,29 @@ function this.ShowBattleResultByQiJie()
end end
end end
--挑战副本战斗界面特殊显示
function this.ShowBattleResultByChallengeCopy()
LogBlue("--挑战副本战斗界面特殊显示")
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
if bestData then
-- 胜利显示本场比赛的表现最好的英雄
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
-- 打开关卡奖励界面
UIManager.OpenPanel(UIName.RewardItemPopup, CarbonManager.battleResult.drop, 1,function(isBackBattle)
if not isBackBattle then
if _BattleBestPopup then
_BattleBestPopup:ClosePanel()
end
if m_battlePanel then
m_battlePanel:ClosePanel()
end
this:ClosePanel()
end
end, 12 , true,true)
end)
end
end
--无尽副本战斗界面特殊显示 --无尽副本战斗界面特殊显示
function this.ShowBattleResultByEndless() function this.ShowBattleResultByEndless()
local bestData, allDamage= BattleRecordManager.GetBattleBestData() local bestData, allDamage= BattleRecordManager.GetBattleBestData()

View File

@ -160,7 +160,7 @@ function RewardItemPopup:OnOpen(...)
this.FightLevel3:SetActive(compShowType == 8)--山河社稷图 this.FightLevel3:SetActive(compShowType == 8)--山河社稷图
this.FightLevel2:SetActive(compShowType == 8 and (not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1)))--山河社稷图 this.FightLevel2:SetActive(compShowType == 8 and (not drop or (#drop.itemlist < 1 and #drop.equipId < 1 and #drop.Hero < 1 and #drop.soulEquip < 1 and #drop.pokemon < 1)))--山河社稷图
this.FightLevelAssistant:SetActive(compShowType == 9)--山河社稷图 this.FightLevelAssistant:SetActive(compShowType == 9)--山河社稷图
this.qiJieCondition:SetActive(compShowType == 10)--七界试炼 this.qiJieCondition:SetActive(compShowType == 10 or compShowType == 12)--七界试炼
this.dropGrid:SetActive(false) this.dropGrid:SetActive(false)
this.dropGridArena:SetActive(false) this.dropGridArena:SetActive(false)
this.lvAndExpGo:SetActive(compShowType == 1) this.lvAndExpGo:SetActive(compShowType == 1)
@ -181,6 +181,8 @@ function RewardItemPopup:OnOpen(...)
this.FightLevelShow() this.FightLevelShow()
elseif compShowType == 10 then--七界试炼 elseif compShowType == 10 then--七界试炼
this.QiJieShow() this.QiJieShow()
elseif compShowType==12 then --挑战副本
this.ChallengeCopyShow()
elseif compShowType == CompShowType.fourElement then elseif compShowType == CompShowType.fourElement then
this.ShengYingShow(args[8]) this.ShengYingShow(args[8])
end end
@ -367,6 +369,14 @@ function this.QiJieShow()
end end
end end
--挑战副本显示信息
function this.ChallengeCopyShow()
local data = CarbonManager.GetBattleResult()
for i = 1, 3 do
Util.GetGameObject(this.qiJieCondition,"Text ("..i..")"):GetComponent("Text").text = data[i]
end
end
--当前背包是否已满 --当前背包是否已满
function RewardItemPopup:SelectCanPopUpBagMaxMessage() function RewardItemPopup:SelectCanPopUpBagMaxMessage()
if(IndicationManager.canPopUpBagMaxMessage) then if(IndicationManager.canPopUpBagMaxMessage) then