diff --git a/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png b/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png
new file mode 100644
index 0000000000..29e496f5eb
Binary files /dev/null and b/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png differ
diff --git a/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png.meta b/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png.meta
new file mode 100644
index 0000000000..2ff46c54f4
--- /dev/null
+++ b/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 139fb394e639a7242a39e118ea05aa1e
+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: -1
+ 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: 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: 8d8ca5336311073458df157f7ea64215
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 4044e422d6..0c9ab50369 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -1075,6 +1075,7 @@ JumpType = {
JumpServerHightLadder = 82,--灵兽山
HongMengZhen = 86,-- 鸿蒙阵
FightLevel = 107,-- 山河社稷图
+ QiJieShiLian = 112,--七界试炼
BuyVigor = 10000, --体力购买
BuyGold = 10001, --金币购买
@@ -1114,7 +1115,6 @@ JumpType = {
firstRecharge = 30001,
ZhiZunJiangShi = 30002,
SurpriseBox = 40001,--惊喜礼盒
- QiJieShiLian = 40026,--七界试炼
linglongShangShi = 20005,
}
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua
index 62887b16fb..462d532b0f 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua
@@ -105,15 +105,33 @@ function GeneralTreasurePanel:showTaskList(isTop,isAni)
end,not isTop,not isAni)
--4 未达成 3 可再次领取 2 可领取 1 已领取 -1 完美领取(充钱领取过的)
--定位打开界面时位置
- local t = 0
- local State = self.treasureData.treasureState == 0 and 2 or 3
- for i = 1, #self.treasureData.dataList do
- if self.treasureData.dataList[i].State == State or self.treasureData.dataList[i].State == 4 then
- t = i
- break
+ -- if isTop then
+ local t = 0
+ if self.treasureData.treasureState == 0 then
+ for i = 1, #self.treasureData.dataList do
+ if self.treasureData.dataList[i].State == 2 then
+ t = i
+ break
+ end
+ end
+ else
+ for i = 1, #self.treasureData.dataList do
+ if self.treasureData.dataList[i].State == 2 or self.treasureData.dataList[i].State == 3 then
+ t = i
+ break
+ end
+ end
end
- end
- self.ScrollView:SetIndex(t-1)
+ if t == 0 then
+ for i = 1, #self.treasureData.dataList do
+ if self.treasureData.dataList[i].State == 4 then
+ t = i
+ break
+ end
+ end
+ end
+ self.ScrollView:SetIndex(t-1)
+ -- end
end
--单个任务
diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua
index ea08680fbf..af8fc78464 100644
--- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua
+++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua
@@ -96,7 +96,7 @@ end
function QiJieTreasure:Refresh(_tabNum)
self.dataList = QiJieShiLianManager.FormatTreasureData(_tabNum)
- self.treasureNum.text = string.format( "%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList)
+ self.treasureNum.text = string.format( "解锁遗物:%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList)
self.ScrollView:SetData(self.dataList, function(index, go)
self:SetSingleData(index,go,self.dataList[index])
end)
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
index 4e2b013d6a..fc70ad63f5 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua
@@ -290,13 +290,13 @@ function this:AddListener()
end
function this:RemoveListener()
- Game.GlobalEvent:AddEvent(GameEvent.QiJieShiLian.CloseBuyTreasure, self.CheckClose,self)
+ Game.GlobalEvent:RemoveEvent(GameEvent.QiJieShiLian.CloseBuyTreasure, self.CheckClose,self)
end
--界面关闭时调用(用于子类重写)
function this:CheckClose()
if curType == 4 then
- this:ClosePanel()
+ parent:ClosePanel()
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua
index bab99484a5..79b90ad95d 100644
--- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua
@@ -153,7 +153,9 @@ end
function this.MixTreasureServerAndLocalData(msg)
this.treasureActiveList = {}
for i = 1, #msg.info do
- table.insert(this.treasureActiveList,msg.info[i].id)
+ if msg.info[i].status == 1 then
+ table.insert(this.treasureActiveList,msg.info[i].id)
+ end
if this.treasureList[msg.info[i].id] then
this.treasureList[msg.info[i].id].state = msg.info[i].status
else
@@ -202,22 +204,25 @@ function this.GetBattleResult()
local config = QijieStage[this.curLevelId]
local data = {}
data[1] = "阵容加成: "..(#this.battleResult.teamBuffIds)*(config.ConditionValue[1][2]/100).."%\n("..#this.battleResult.teamBuffIds.."条)"
- data[2] = "遗物加成: "..(#this.battleResult.relicIds*10).."%\n("..#this.battleResult.relicIds.."个)"
- local bonue = config.RoundReward[1][2]
- for i = 1, #config.RoundReward do
- if this.battleResult.round > config.RoundReward[i][1] then
+ data[2] = "遗物加成: "..(this.GetBttleResultRelicdsAddition(this.battleResult.relicIds)).."%\n("..#this.battleResult.relicIds.."个)"
+ local bonue = 0
+ for i = #config.RoundReward, 1, -1 do
+ if this.battleResult.round <= config.RoundReward[i][1] then
bonue = config.RoundReward[i][2]
- if config.RoundReward[i+1] then
- bonue = config.RoundReward[i][2]
- else
- bonue = 0
- end
end
end
data[3] = "回合加成: "..(bonue/100).."%\n("..this.battleResult.round.."回合)"
return data
end
+function this.GetBttleResultRelicdsAddition(treasureList)
+ local num = 0
+ for i = 1, #treasureList do
+ num = num + QijieHolyConfig[treasureList[i]].Addition
+ end
+ return num/100
+end
+
--获取遗物效果
function this.GetTreasureEffect(treasureList)
local moneyString = ""
@@ -276,13 +281,13 @@ function this.GetSring(stringList,type)
local str = ""
for k,v in pairs(stringList) do
-- LogPink("Desc1:"..tostring(v.title))
- str = str..v.title
for m,n in pairs(v) do
if tonumber(m) then
+ str = str..v.title
-- LogBlue("m2:"..tostring(tonumber(m)))
-- LogBlue("Desc2:"..tostring(n.Desc))
-- LogBlue("Value2:"..tostring(n.Value))
- str = str..string.format(n.Desc,""..n.Value.."%")
+ str = str..string.format(n.Desc,n.Value.."%")
if type and type == 1 then
str = str.."\n"
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
index d03473b138..c7cc056453 100644
--- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
@@ -313,7 +313,7 @@ function this.SetHeadsInfo(data,root,index,name,level)
elseif sData.rankType == RANK_TYPE.WORLDARENA then--玉虚论道
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, data.uid,2)
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
- UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN,data.serverName and data.serverName or nil)
+ UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.NORMAL,data.serverName and data.serverName or nil)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)
end