diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_baodijiaobiao_zh.png b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_baodijiaobiao_zh.png
new file mode 100644
index 0000000000..55c0867b0b
Binary files /dev/null and b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_baodijiaobiao_zh.png differ
diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_baodijiaobiao_zh.png.meta b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_baodijiaobiao_zh.png.meta
new file mode 100644
index 0000000000..bc5ba2acd3
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_baodijiaobiao_zh.png.meta
@@ -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:
diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_jindujiaobiao_zh.png b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_jindujiaobiao_zh.png
new file mode 100644
index 0000000000..acaeb804a8
Binary files /dev/null and b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_jindujiaobiao_zh.png differ
diff --git a/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_jindujiaobiao_zh.png.meta b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_jindujiaobiao_zh.png.meta
new file mode 100644
index 0000000000..9d9833d223
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/CarbonAtlas/ArtFont/x_xianyuan_jindujiaobiao_zh.png.meta
@@ -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:
diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab
index 00c99c07b1..78c3c9f2fc 100644
--- a/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Carbon/ChallengeCopyPanel.prefab
@@ -739,7 +739,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6901831702187834385
@@ -1349,7 +1349,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {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_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6899759931426735578
diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
index 38ccaf343a..cb7106ad42 100644
--- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
@@ -493,6 +493,9 @@ CHALLENGERESPONSE = protobuf.Descriptor();
CHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CHALLENGERESPONSE_FIGHTDATA_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_ID_FIELD = protobuf.FieldDescriptor();
GETSOMEACTITITYINFORESPONE = protobuf.Descriptor();
@@ -5235,11 +5238,41 @@ CHALLENGERESPONSE_RESULT_FIELD.default_value = 0
CHALLENGERESPONSE_RESULT_FIELD.type = 5
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.full_name = ".rpc.protocols.ChallengeResponse"
CHALLENGERESPONSE.nested_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.extensions = {}
GETSOMEACTIVITYINFOREQUEST_ID_FIELD.name = "id"
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
index a1fea99e8b..59be68e14e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
@@ -601,12 +601,8 @@ function this.ShowBattleResult(result, msg)
elseif fightType == BATTLE_TYPE.LINGMAIMIJING then
this:ClosePanel()
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.BattleFailPopup, this, haveRecord,nil,fightType)
- else
- this:ClosePanel()
- end
+ --只显示胜利界面
+ UIManager.OpenPanel(UIName.BattleWinPopup, this, isBack, fightType, this.lastBattleResult)
else
LogRed("result:"..tostring(result))
if result == 0 then -- 失败
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
index ebe30bb2cb..cbf1da5af6 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
@@ -1112,4 +1112,16 @@ function this.CheckCopyOpenState(copyId)
return this.challengeCopyDataTable[copyId].overTime==1
end
+--获取战斗结束后信息(拼接)
+function this.GetBattleResult()
+ local data = {}
+ if this.battleResult.type==1 then
+ data[1] = "奖励加成: "..(this.battleResult.percentReward/100).."%\n("..this.battleResult.lossBloodOrTimes.."回合)"
+ else
+ data[1] = "奖励加成: "..(this.battleResult.percentReward/100).."%\n(总伤害:"..this.battleResult.lossBloodOrTimes..")"
+ end
+
+ return data
+end
+
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua
index 43b7c5cadd..df5a9332c1 100644
--- a/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Carbon/ChallengeCopyPanel.lua
@@ -54,7 +54,6 @@ function ChallengeCopyPanel:InitComponent()
this.backBtn=Util.GetGameObject(this.panel,"BackBtn")
this.helpBtn= Util.GetGameObject(this.panel, "HelpBtn")
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
-
--滚动条
this.pre = Util.GetGameObject(this.panel, "Scroll/Pre")
this.scroll = Util.GetGameObject(this.panel, "Scroll")
@@ -149,6 +148,8 @@ function this.RefreshShow(i)
local challengeStageId=CarbonManager.challengeCopyDataTable[carbonIndex].currentFloor
if challengeStageId>0 then
fightIndex= ConfigManager.GetConfigData(ConfigName.ChallengeStage,challengeStageId).Section
+ else
+ fightIndex=1
end
curData={}
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 title=Util.GetGameObject(root,"Title"):GetComponent("Image")
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 power=Util.GetGameObject(root,"powerBtn/value"):GetComponent("Text")
power.transform.parent.gameObject:SetActive(false)
@@ -194,11 +195,26 @@ function this.SetData(root, data)
bgQuality.sprite=this.spLoader:LoadSprite(qualityBg[1].b)
type=CarbonManager.CheckChallengeCopyId(data.Chapter,data.NextLevel)
local showReward={}
+ ConnectTable(showReward,data.FixedReward)
ConnectTable(showReward,data.PassReward)
if type~=2 then
ConnectTable(showReward,data.VictoryReward)
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 --等级
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/ChallengeCopyFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/ChallengeCopyFormation.lua
index d036f9707e..7843bb2402 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/View/ChallengeCopyFormation.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/ChallengeCopyFormation.lua
@@ -59,6 +59,7 @@ end
function this.StartFight()
NetManager.ChallengeCopyRequest(this.data.Chapter,1,this.data .Id,function(msg)
LogGreen("挑战副本战斗返回:")
+ this.root:ClosePanel()
local fightData = BattleManager.GetBattleServerData(msg)
local battleType
if this.data.Chapter==1 then
@@ -66,16 +67,13 @@ function this.StartFight()
else
battleType=BATTLE_TYPE.CHALLENG_COPY_2
end
- local battlePanel= UIManager.OpenPanel(UIName.BattlePanel, fightData, battleType , function()
- LogGreen("222222战斗结果:"..msg.result)
- UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1)
- this.root:ClosePanel()
- end)
- battlePanel:SetExternalData(msg.result)
+ CarbonManager.battleResult = msg
+ UIManager.OpenPanel(UIName.BattlePanel, fightData, battleType)
if msg.result==1 then
CarbonManager.UpdateChallengeCopyFloor(this.data.Chapter)
end
PrivilegeManager.RefreshPrivilegeUsedTimes(this.data.PivilegeID[2],1)
+
end)
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
index 9a2cfd6f0e..9c3afbf87f 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
@@ -55,10 +55,9 @@ function BattleWinPopup:NextStep()
this.ShowBattleResultByFourElement(m_battleResult.drop)
elseif m_fightType == BATTLE_TYPE.EXECUTE_FIGHT then -- 猎妖之路
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.TRIAL_FIGHT -- 日常副本
- or m_fightType == BATTLE_TYPE.CHALLENG_COPY_2 then
+ or m_fightType == BATTLE_TYPE.TRIAL_FIGHT then
m_battlePanel:ClosePanel() self:ClosePanel(m_battleResult.drop)
elseif m_fightType == BATTLE_TYPE.GUILD_CAR_DELAY then -- 车迟
this.ShowBattleResultByCarDeleayType(m_battleResult.drop)
@@ -74,6 +73,8 @@ function BattleWinPopup:NextStep()
this.ShowBattleResultByEndless()
elseif m_fightType == BATTLE_TYPE.QIJIE_FIGHT then--七界试炼战斗
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
if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗
@@ -145,6 +146,29 @@ function this.ShowBattleResultByQiJie()
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()
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
index 0ff19ed555..38e1f35f50 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
@@ -160,7 +160,7 @@ function RewardItemPopup:OnOpen(...)
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.FightLevelAssistant:SetActive(compShowType == 9)--山河社稷图
- this.qiJieCondition:SetActive(compShowType == 10)--七界试炼
+ this.qiJieCondition:SetActive(compShowType == 10 or compShowType == 12)--七界试炼
this.dropGrid:SetActive(false)
this.dropGridArena:SetActive(false)
this.lvAndExpGo:SetActive(compShowType == 1)
@@ -181,6 +181,8 @@ function RewardItemPopup:OnOpen(...)
this.FightLevelShow()
elseif compShowType == 10 then--七界试炼
this.QiJieShow()
+ elseif compShowType==12 then --挑战副本
+ this.ChallengeCopyShow()
elseif compShowType == CompShowType.fourElement then
this.ShengYingShow(args[8])
end
@@ -367,6 +369,14 @@ function this.QiJieShow()
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()
if(IndicationManager.canPopUpBagMaxMessage) then