Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-10-18 16:19:19 +08:00
commit bc7e316531
31 changed files with 11160 additions and 9773 deletions

View File

@ -6139,7 +6139,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 396.8, y: 714.3} m_AnchoredPosition: {x: 396.8, y: 714.3}
m_SizeDelta: {x: 98.19, y: 98.19} m_SizeDelta: {x: 104, y: 104}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8615198845383106814 --- !u!222 &8615198845383106814
CanvasRenderer: CanvasRenderer:

View File

@ -757,7 +757,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0.000015258789} m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &5343069358979546458 --- !u!114 &5343069358979546458
@ -2448,7 +2448,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.41960785} m_Color: {r: 0, g: 0, b: 0, a: 0.9019608}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:

View File

@ -985,6 +985,7 @@ RedPointType = {
--七界试炼 --七界试炼
QiJieShiLian = 860,--入口 QiJieShiLian = 860,--入口
QiJieTreasure = 8601,--秘宝 QiJieTreasure = 8601,--秘宝
WorldArena_reward = 672, --玉虚论道奖励
} }
RedPointStatus = { RedPointStatus = {
@ -1083,10 +1084,10 @@ JumpType = {
JumpServerHightLadder = 82,--灵兽山 JumpServerHightLadder = 82,--灵兽山
HongMengZhen = 86,-- 鸿蒙阵 HongMengZhen = 86,-- 鸿蒙阵
FightLevel = 107,-- 山河社稷图 FightLevel = 107,-- 山河社稷图
likeability = 114, YuXuLunDao= 111, --玉虚论道
QiJieShiLian = 112,--七界试炼 QiJieShiLian = 112,--七界试炼
SiXiangXinFa = 113,--四象心法 SiXiangXinFa = 113,--四象心法
likeability = 114,
BuyVigor = 10000, --体力购买 BuyVigor = 10000, --体力购买
BuyGold = 10001, --金币购买 BuyGold = 10001, --金币购买
Privilege = 10003, -- 特权 Privilege = 10003, -- 特权
@ -1754,6 +1755,7 @@ HELP_TYPE = {
Likeability = 110, Likeability = 110,
QiJieTreasure = 105,--七界秘宝 QiJieTreasure = 105,--七界秘宝
QiJieShiLian = 106,--七界试炼 QiJieShiLian = 106,--七界试炼
YuXu = 107,--玉虚
FourQuadrant=108,--四象心法 FourQuadrant=108,--四象心法
} }
@ -2159,10 +2161,10 @@ RANK_TYPE = {
JUMPSERVER_FORCE_CURR_RANK = 33,--跨服战力排行 JUMPSERVER_FORCE_CURR_RANK = 33,--跨服战力排行
JUMPSERVER_MONSTER_RANK = 34,--跨服心魔排行 JUMPSERVER_MONSTER_RANK = 34,--跨服心魔排行
JUMPSERVER_FIGHTLEVEL_STAR = 35,--跨服山河排行 JUMPSERVER_FIGHTLEVEL_STAR = 35,--跨服山河排行
JUMPSERVER_GUILD_FORCE_RANK = 36,--跨服公会排行 JUMPSERVER_GUILD_FORCE_RANK = 36,--跨服公会排行 37也是玉虚论道再用
WORLDARENA=37, --玉虚论道排行榜
PERSON_CHALLENGE = 38,--四灵试炼人排行 PERSON_CHALLENGE = 38,--四灵试炼人排行
QIJIESHILIAN_RANK = 39,--七界试炼排行榜 QIJIESHILIAN_RANK = 39,--七界试炼排行榜
WORLDARENA=40, --玉虚论道排行榜
} }
--东海寻仙弹窗类型 --东海寻仙弹窗类型
@ -2911,4 +2913,4 @@ _ItemIdToVipPrivilege = {
[14] = 1, [14] = 1,
[3] = 1, [3] = 1,
[17] = 27, [17] = 27,
} }

View File

@ -207,7 +207,7 @@ local ManagerNames = {
--七界试炼管理器 --七界试炼管理器
"QiJieShiLian/QiJieShiLianManager", "QiJieShiLian/QiJieShiLianManager",
--玉虚论道管理器 --玉虚论道管理器
-- "WorldArena/WorldArenaManager", "WorldArena/WorldArenaManager",
--秘宝管理器 --秘宝管理器
"GeneralPanel/GeneralTreasureMangaer", "GeneralPanel/GeneralTreasureMangaer",
--!!!!红点管理(尽量放在最后)!!!!-- --!!!!红点管理(尽量放在最后)!!!!--

View File

@ -159,6 +159,26 @@ function AddParticleSortLayer(go,layer)
end end
end end
end end
function SetParticleSortLayer(go,layer)
if layer==0 then
return
end
local list=go.transform:GetComponentsInChildren(typeof(UnityEngine.Transform)):ToTable()
for key, value in pairs(list) do
local aaa=value
local render=aaa:GetComponent(typeof(UnityEngine.Renderer))
if render then
render.sortingOrder=layer
end
local canvas=aaa:GetComponent(typeof(UnityEngine.Canvas))
if canvas then
canvas.sortingOrder=layer
end
end
end
function Util_SetToDefaultHeadImage(spLoader, image) function Util_SetToDefaultHeadImage(spLoader, image)
if image == nil then if image == nil then
return return

View File

@ -92,6 +92,7 @@ TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
TAKEARENABATTLEREWARDRESPONSE = protobuf.Descriptor(); TAKEARENABATTLEREWARDRESPONSE = protobuf.Descriptor();
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFOREQUEST = protobuf.Descriptor(); CROSSYUXULUNDAOGETINFOREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE = protobuf.Descriptor(); CROSSYUXULUNDAOGETINFORESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD = protobuf.FieldDescriptor(); CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor(); CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
@ -957,11 +958,21 @@ TAKEARENABATTLEREWARDRESPONSE.enum_types = {}
TAKEARENABATTLEREWARDRESPONSE.fields = {TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD} TAKEARENABATTLEREWARDRESPONSE.fields = {TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD}
TAKEARENABATTLEREWARDRESPONSE.is_extendable = false TAKEARENABATTLEREWARDRESPONSE.is_extendable = false
TAKEARENABATTLEREWARDRESPONSE.extensions = {} TAKEARENABATTLEREWARDRESPONSE.extensions = {}
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.name = "type"
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest.type"
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.number = 1
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.index = 0
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.label = 1
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.type = 5
CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFOREQUEST.name = "CrossYuXuLunDaoGetInfoRequest" CROSSYUXULUNDAOGETINFOREQUEST.name = "CrossYuXuLunDaoGetInfoRequest"
CROSSYUXULUNDAOGETINFOREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest" CROSSYUXULUNDAOGETINFOREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest"
CROSSYUXULUNDAOGETINFOREQUEST.nested_types = {} CROSSYUXULUNDAOGETINFOREQUEST.nested_types = {}
CROSSYUXULUNDAOGETINFOREQUEST.enum_types = {} CROSSYUXULUNDAOGETINFOREQUEST.enum_types = {}
CROSSYUXULUNDAOGETINFOREQUEST.fields = {} CROSSYUXULUNDAOGETINFOREQUEST.fields = {CROSSYUXULUNDAOGETINFOREQUEST_TYPE_FIELD}
CROSSYUXULUNDAOGETINFOREQUEST.is_extendable = false CROSSYUXULUNDAOGETINFOREQUEST.is_extendable = false
CROSSYUXULUNDAOGETINFOREQUEST.extensions = {} CROSSYUXULUNDAOGETINFOREQUEST.extensions = {}
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.name = "isFirst" CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.name = "isFirst"

View File

@ -738,6 +738,8 @@ CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD = protobuf.FieldDescriptor(); CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD = protobuf.FieldDescriptor(); CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD = protobuf.FieldDescriptor(); CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD = protobuf.FieldDescriptor();
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD = protobuf.FieldDescriptor();
SIXIANGXINFAPROPERTYINFO = protobuf.Descriptor(); SIXIANGXINFAPROPERTYINFO = protobuf.Descriptor();
SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor(); SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
SIXIANGXINFAPROPERTYINFO_PROPERTYNUM_FIELD = protobuf.FieldDescriptor(); SIXIANGXINFAPROPERTYINFO_PROPERTYNUM_FIELD = protobuf.FieldDescriptor();
@ -7789,11 +7791,31 @@ CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.default_value = ""
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.type = 9 CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.type = 9
CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.cpp_type = 9 CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD.cpp_type = 9
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.name = "yxldMyForce"
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.yxldMyForce"
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.number = 19
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.index = 18
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.label = 3
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.has_default_value = false
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.default_value = {}
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.type = 5
CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD.cpp_type = 1
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.name = "yxldDefForce"
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo.yxldDefForce"
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.number = 20
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.index = 19
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.label = 3
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.has_default_value = false
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.default_value = {}
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.type = 5
CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD.cpp_type = 1
CROSSYXLDPLAYERRECORDINFO.name = "crossYxldPlayerRecordInfo" CROSSYXLDPLAYERRECORDINFO.name = "crossYxldPlayerRecordInfo"
CROSSYXLDPLAYERRECORDINFO.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo" CROSSYXLDPLAYERRECORDINFO.full_name = ".rpc.protocols.crossYxldPlayerRecordInfo"
CROSSYXLDPLAYERRECORDINFO.nested_types = {} CROSSYXLDPLAYERRECORDINFO.nested_types = {}
CROSSYXLDPLAYERRECORDINFO.enum_types = {} CROSSYXLDPLAYERRECORDINFO.enum_types = {}
CROSSYXLDPLAYERRECORDINFO.fields = {CROSSYXLDPLAYERRECORDINFO_UID_FIELD, CROSSYXLDPLAYERRECORDINFO_LEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_HEAD_FIELD, CROSSYXLDPLAYERRECORDINFO_USERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_HEADFRAME_FIELD, CROSSYXLDPLAYERRECORDINFO_TIME_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA1_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA2_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA3_FIELD, CROSSYXLDPLAYERRECORDINFO_POWER_FIELD, CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD, CROSSYXLDPLAYERRECORDINFO_PRACTICELEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSCORECHANGE_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULTLIST_FIELD, CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD, CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD} CROSSYXLDPLAYERRECORDINFO.fields = {CROSSYXLDPLAYERRECORDINFO_UID_FIELD, CROSSYXLDPLAYERRECORDINFO_LEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_HEAD_FIELD, CROSSYXLDPLAYERRECORDINFO_USERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_HEADFRAME_FIELD, CROSSYXLDPLAYERRECORDINFO_TIME_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA1_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA2_FIELD, CROSSYXLDPLAYERRECORDINFO_FIGHTDATA3_FIELD, CROSSYXLDPLAYERRECORDINFO_POWER_FIELD, CROSSYXLDPLAYERRECORDINFO_TYPE_FIELD, CROSSYXLDPLAYERRECORDINFO_PRACTICELEVEL_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSCORECHANGE_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULTLIST_FIELD, CROSSYXLDPLAYERRECORDINFO_SCORE_FIELD, CROSSYXLDPLAYERRECORDINFO_SERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_RESULT_FIELD, CROSSYXLDPLAYERRECORDINFO_MYSERVERNAME_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDMYFORCE_FIELD, CROSSYXLDPLAYERRECORDINFO_YXLDDEFFORCE_FIELD}
CROSSYXLDPLAYERRECORDINFO.is_extendable = false CROSSYXLDPLAYERRECORDINFO.is_extendable = false
CROSSYXLDPLAYERRECORDINFO.extensions = {} CROSSYXLDPLAYERRECORDINFO.extensions = {}
SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD.name = "propertyId" SIXIANGXINFAPROPERTYINFO_PROPERTYID_FIELD.name = "propertyId"

View File

@ -412,6 +412,7 @@ VIEWHEROINFORESPONSE_EQUIP_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_FORCE_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFORESPONSE_FORCE_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD = protobuf.FieldDescriptor(); VIEWHEROINFORESPONSE_GUILDSKILL_FIELD = protobuf.FieldDescriptor();
VIEWHEROINFORESPONSE_TREELEVEL_FIELD = protobuf.FieldDescriptor();
RANKREQUEST = protobuf.Descriptor(); RANKREQUEST = protobuf.Descriptor();
RANKREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); RANKREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
RANKREQUEST_ACTIVITEID_FIELD = protobuf.FieldDescriptor(); RANKREQUEST_ACTIVITEID_FIELD = protobuf.FieldDescriptor();
@ -4410,11 +4411,21 @@ VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.default_value = 0
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.type = 5 VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.type = 5
VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.cpp_type = 1 VIEWHEROINFORESPONSE_GUILDSKILL_FIELD.cpp_type = 1
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.name = "treeLevel"
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.full_name = ".rpc.protocols.ViewHeroInfoResponse.treeLevel"
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.number = 6
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.index = 5
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.label = 1
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.has_default_value = false
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.default_value = 0
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.type = 5
VIEWHEROINFORESPONSE_TREELEVEL_FIELD.cpp_type = 1
VIEWHEROINFORESPONSE.name = "ViewHeroInfoResponse" VIEWHEROINFORESPONSE.name = "ViewHeroInfoResponse"
VIEWHEROINFORESPONSE.full_name = ".rpc.protocols.ViewHeroInfoResponse" VIEWHEROINFORESPONSE.full_name = ".rpc.protocols.ViewHeroInfoResponse"
VIEWHEROINFORESPONSE.nested_types = {} VIEWHEROINFORESPONSE.nested_types = {}
VIEWHEROINFORESPONSE.enum_types = {} VIEWHEROINFORESPONSE.enum_types = {}
VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD} VIEWHEROINFORESPONSE.fields = {VIEWHEROINFORESPONSE_HERO_FIELD, VIEWHEROINFORESPONSE_EQUIP_FIELD, VIEWHEROINFORESPONSE_SPECIALEFFECTS_FIELD, VIEWHEROINFORESPONSE_FORCE_FIELD, VIEWHEROINFORESPONSE_GUILDSKILL_FIELD, VIEWHEROINFORESPONSE_TREELEVEL_FIELD}
VIEWHEROINFORESPONSE.is_extendable = false VIEWHEROINFORESPONSE.is_extendable = false
VIEWHEROINFORESPONSE.extensions = {} VIEWHEROINFORESPONSE.extensions = {}
RANKREQUEST_TYPE_FIELD.name = "type" RANKREQUEST_TYPE_FIELD.name = "type"

View File

@ -594,9 +594,16 @@ function this.SetRoleList(_roleDatas, isTop,isAni)
else else
this.SortHeroDatas(_roleDatas) this.SortHeroDatas(_roleDatas)
end end
--刷新玉虚论道缓存的阵容数据
if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then
this.opView.RemoveTeamByIndex(this.curFormationIndex) this.opView.RemoveTeamByIndex(this.curFormationIndex)
for i,v in pairs(this.choosedList) do
--LogError("刷新添加=== id=="..v.heroId.." pos=="..v.position)
this.opView.AddHeroToTeam(v.heroId,v.position,this.curFormationIndex)
end
end end
-- local curFormation = FormationManager.formationList[this.curFormationIndex] -- local curFormation = FormationManager.formationList[this.curFormationIndex]
this.scrollView:SetData(_roleDatas, function(index, go) this.scrollView:SetData(_roleDatas, function(index, go)
this.SingleHeroDataShow(go, _roleDatas[index]) this.SingleHeroDataShow(go, _roleDatas[index])
@ -775,9 +782,6 @@ function this.SingleHeroDataShow(_go, _heroData)
for i,v in pairs(this.choosedList) do for i,v in pairs(this.choosedList) do
if(heroData.dynamicId==v.heroId) then if(heroData.dynamicId==v.heroId) then
choosedObj:SetActive(true) choosedObj:SetActive(true)
if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then
this.opView.AddHeroToTeam(heroData.dynamicId,v.position,this.curFormationIndex)
end
end end
end end
if panelType == FORMATION_TYPE.WORLDARENA then if panelType == FORMATION_TYPE.WORLDARENA then

View File

@ -26,7 +26,7 @@ local switchFunc = function (type)
this.curIndex = 1 this.curIndex = 1
end end
else else
LogError("curindex==3") LogGreen("curindex==3")
end end
else else
if this.curIndex ~= 1 then if this.curIndex ~= 1 then
@ -36,10 +36,11 @@ local switchFunc = function (type)
this.curIndex = 3 this.curIndex = 3
end end
else else
LogError("curindex==1") LogGreen("curindex==1")
end end
end end
this.ChangeTeamIndex(type) this.ChangeTeamIndex(type)
PopupTipPanel.ShowTip("已交换队伍顺序!")
end end
local isLeftOrRight=false local isLeftOrRight=false
@ -204,7 +205,7 @@ function this.ChangeHeroTeam(id,_index,_pos)
for i = 1, #value.teamHeroInfos do for i = 1, #value.teamHeroInfos do
if value.teamHeroInfos[i].heroId==id then if value.teamHeroInfos[i].heroId==id then
hero=value.teamHeroInfos[i] hero=value.teamHeroInfos[i]
LogError("从旧队伍里面移除 "..value.teamId) LogGreen("从旧队伍里面移除 "..value.teamId)
table.removebyvalue(value.teamHeroInfos,value.teamHeroInfos[i]) table.removebyvalue(value.teamHeroInfos,value.teamHeroInfos[i])
break break
end end
@ -214,7 +215,7 @@ function this.ChangeHeroTeam(id,_index,_pos)
table.insert(currAllTeams[_index].teamHeroInfos,hero) table.insert(currAllTeams[_index].teamHeroInfos,hero)
allHeros[id].pos=_pos allHeros[id].pos=_pos
allHeros[id].index=_index allHeros[id].index=_index
LogError("添加到新队伍 ".._index) LogGreen("添加到新队伍 ".._index)
end end
--添加到队伍 --添加到队伍
@ -231,7 +232,7 @@ function this.AddHeroToTeam(id,pos,index)
end end
table.insert(currAllTeams[index].teamHeroInfos,{heroId=id,position=pos}) table.insert(currAllTeams[index].teamHeroInfos,{heroId=id,position=pos})
if not allHeros[id] then if not allHeros[id] then
LogError(" 新添加英雄=="..id) -- LogError(" 新添加英雄=="..id)
allHeros[id]={Id=id,pos=pos,index=index} allHeros[id]={Id=id,pos=pos,index=index}
else else
allHeros[id].Id=id allHeros[id].Id=id
@ -310,13 +311,13 @@ function this.On_Btn2_Click()
local twoTeam={} local twoTeam={}
local threeTeam={} local threeTeam={}
local allTeam={} local allTeam={}
--检测三个队伍是否有重复英雄 --检测三个队伍是否有重复英雄
local len = 0 local len = 0
for key, value in pairs(allHeros) do for key, value in pairs(allHeros) do
local newHero={} local newHero={}
newHero.heroId=value.Id newHero.heroId=value.Id
newHero.position=value.pos newHero.position=value.pos
LogError(" id=="..value.Id.." posi=="..value.pos)
if value.index==2001 then if value.index==2001 then
table.insert(oneTeam,newHero) table.insert(oneTeam,newHero)
elseif value.index==2002 then elseif value.index==2002 then
@ -342,13 +343,70 @@ function this.On_Btn2_Click()
this.root:ClosePanel() this.root:ClosePanel()
end end
--排序
function this.SortHeroDatas()
end
-- 获取要显示得英雄列表 -- 获取要显示得英雄列表
function this.GetHeroList(proId) function this.GetHeroList(proId)
local first ={}
local one = {}
local two = {}
local three = {}
local four={}
local currHeros = {}
if not proId or proId==0 then if not proId or proId==0 then
return HeroManager.GetAllHeroDatas() currHeros=HeroManager.GetAllHeroDatas()
else
currHeros=HeroManager.GetHeroDataByProperty(proId)
end end
return HeroManager.GetHeroDataByProperty(proId) table.sort(currHeros,function(a,b)
return this.root.NaturalSort(true,a,b)
end)
local currIndex=this.GetFormationIndex()
for i = 1,#currHeros do
local hero = currHeros[i]
if hero then
if allHeros[hero.dynamicId] then
local index = allHeros[hero.dynamicId].index
if index==currIndex then
table.insert(first,hero)
else
if index==2001 then
table.insert(one,hero)
elseif index==2002 then
table.insert(two,hero)
elseif index==2003 then
table.insert(three,hero)
end
end
else
table.insert(four,hero)
end
end
end
local allHero = {}
for i = 1, #first do
table.insert(allHero,first[i])
end
for i = 1, #one do
table.insert(allHero,one[i])
end
for i = 1, #two do
table.insert(allHero,two[i])
end
for i = 1, #three do
table.insert(allHero,three[i])
end
for i = 1, #four do
table.insert(allHero,four[i])
end
return allHero
end end
-- 获取一键上阵所需要的英雄列表 -- 获取一键上阵所需要的英雄列表

View File

@ -118,11 +118,18 @@ function this.GetHightLadderDataIsGroup()
return isGroup ~= 0 return isGroup ~= 0
end end
function this.GetHightLadderDataIsStart() function this.GetHightLadderDataIsStart()
LogRed("isStart1:"..tostring(isStart))
return isStart >= mServerArenaSetting[1].OpenWeek return isStart >= mServerArenaSetting[1].OpenWeek
end end
function this.GetQiJieIsStart() function this.GetQiJieIsStart()
LogRed("isStart3:"..tostring(isStart))
return isStart >= mServerArenaSetting[3].OpenWeek return isStart >= mServerArenaSetting[3].OpenWeek
end end
function this.GetYuxuIsStart()
LogRed("isStart2:"..tostring(isStart))
return isStart >= mServerArenaSetting[2].OpenWeek
end
-- 获取剩余挑战次数 特权 -- 获取剩余挑战次数 特权
function this.GetCanBattleCount() function this.GetCanBattleCount()
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM) return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM)

View File

@ -25,13 +25,13 @@ local type = {
sort = 3, sort = 3,
bg = "r_Dungeon_rendi_01", bg = "r_Dungeon_rendi_01",
name = "y_yuxulundao_yuxurukou_zh", name = "y_yuxulundao_yuxurukou_zh",
live = "m_chsm_0035_png", live = "lingjijuyuan",
livePos = Vector2(274.5, -408.1), livePos = Vector2(149, 13),
liveSize = Vector2(1612, 1802), liveSize = Vector2(1024, 356),
tipBg = "r_Dungeon_juqingdian", tipBg = "r_Dungeon_juqingdian",
resetTime = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value), resetTime = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
tip = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value), tip = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
redPointType = RedPointType.JumpServer_HightLadder, redPointType = RedPointType.WorldArena_reward,
tipStr = "", tipStr = "",
state = 0, state = 0,
}, },
@ -167,8 +167,10 @@ function JumpServerPanel:BtnClick(id)
end end
if id == JumpServer_Type.YuXuLunDao then if id == JumpServer_Type.YuXuLunDao then
UIManager.OpenPanel(UIName.WorldArenaMainPanel) NetManager.CrossYuXuLunDaoGetInfoRequest(1,function(msg)
self:ClosePanel() UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
self:ClosePanel()
end)
end end
if id == JumpServer_Type.QiJieShiLian then if id == JumpServer_Type.QiJieShiLian then
local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage) local qiejieConfig = ConfigManager.GetConfig(ConfigName.QijieStage)
@ -245,9 +247,9 @@ function JumpServerPanel:SystemState(id,fun)
end end
-- 跨服相关判断 -- 跨服相关判断
JumpServerManager.GetWorldArenaInfoRequest(function() JumpServerManager.GetWorldArenaInfoRequest(function()
if not JumpServerManager.GetHightLadderDataIsStart() then if not JumpServerManager.GetYuxuIsStart() then
type[id].state = -4 type[id].state = -4
type[id].tipStr = string.format("开服第%s周开放",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek) type[id].tipStr = string.format("开服第%s周开放",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,2).OpenWeek)
elseif not JumpServerManager.GetHightLadderDataIsGroup() then elseif not JumpServerManager.GetHightLadderDataIsGroup() then
type[id].state = -5 type[id].state = -5
type[id].tipStr = "未划分跨服分组,无法参与!" type[id].tipStr = "未划分跨服分组,无法参与!"

View File

@ -677,7 +677,8 @@ function this.ExecuteLoading()
--[[[47] =]]function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜 --[[[47] =]]function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜
--[[[48] =]]function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服 --[[[48] =]]function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服
--[[[49] =]]function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷 --[[[49] =]]function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷
--[[[50] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度 --[[[50] =]]function() NetManager.CrossYuXuLunDaoGetInfoRequest(2,LoadingPanel.OnStep) end, --玉虚论道红点
--[[[51] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度
function() -- 登录请求最终接口,所有请求放在此接口之前 function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认 -- 登录成功确认
NetManager.LoginConfimRequest() NetManager.LoginConfimRequest()

View File

@ -87,7 +87,7 @@ function GMPanel:InitComponent()
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级魂灵宝", inputTip = {""}, callBack = this.Baowu}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级魂灵宝", inputTip = {""}, callBack = this.Baowu},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级装备", inputTip = {""}, callBack = this.GetEquipe}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成顶级装备", inputTip = {""}, callBack = this.GetEquipe},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "鑫鹏的gm", inputTip = {""}, callBack = this.SendToXinPeng},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = "获取", inputTip = {"天宫秘宝积分"}, callBack = nil}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = "获取", inputTip = {"天宫秘宝积分"}, callBack = nil},
@ -270,6 +270,12 @@ function this.GetManyHeros(text)
end) end)
end end
end end
function this.SendToXinPeng()
NetManager.GMEvent("26")
end
-- 设置孙龙积分 -- 设置孙龙积分
function this.SetSunLongScroe(text) function this.SetSunLongScroe(text)
TreasureOfSomebodyManagerV2.SetCurrentLevel(tonumber(text)) TreasureOfSomebodyManagerV2.SetCurrentLevel(tonumber(text))

View File

@ -5633,13 +5633,19 @@ function NetManager.TaiChuSecretvolumeRequest(func)
end end
--请求玉虚论道主界面信息 --请求玉虚论道主界面信息
function NetManager.CrossYuXuLunDaoGetInfoRequest(func) function NetManager.CrossYuXuLunDaoGetInfoRequest(_type,func)
local data=ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoRequest() local data=ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoRequest()
if _type==0 then
data.type=0
else
data.type= tonumber(_type)
end
local msg = data:SerializeToString() local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoGetInfoRequest, MessageTypeProto_pb.CrossYuXuLunDaoGetInfoResponse, msg, function(buffer) Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoGetInfoRequest, MessageTypeProto_pb.CrossYuXuLunDaoGetInfoResponse, msg, function(buffer)
local data = buffer:DataByte() local data = buffer:DataByte()
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoResponse() local msg = ArenaInfoProto_pb.CrossYuXuLunDaoGetInfoResponse()
msg:ParseFromString(data) msg:ParseFromString(data)
WorldArenaManager.SetRewardData(msg.dailyRewardState,msg.changedTimes)
if func then if func then
func(msg) func(msg)
end end

View File

@ -799,6 +799,13 @@ local jumpDic = {
end) end)
end) end)
end, end,
[JumpType.YuXuLunDao] = function(data)
QiJieShiLianManager.CheckQiJieJump(FUNCTION_OPEN_TYPE.JumpServer_YuXu,2,function ()
NetManager.CrossYuXuLunDaoGetInfoRequest(1,function(msg)
UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
end)
end)
end,
[JumpType.linglongBaojing] = function(data) [JumpType.linglongBaojing] = function(data)
this.JumpActivity(JumpType.linglongBaojing % 10000,data[1]) this.JumpActivity(JumpType.linglongBaojing % 10000,data[1])
end, end,

View File

@ -305,7 +305,8 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.DailyRecharge,RedPointType.RightUp2) RPData:SetParent(RedPointType.DailyRecharge,RedPointType.RightUp2)
--七界试炼 --七界试炼
RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity) RPData:SetParent(RedPointType.QiJieShiLian, RedPointType.JumpServer_MainCity)
--玉虚论道
RPData:SetParent(RedPointType.WorldArena_reward, RedPointType.JumpServer_MainCity)
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.ActivityGroups)) do
if v.RpType > 0 and v.RpTypeParent > 0 then if v.RpType > 0 and v.RpTypeParent > 0 then
RPData:SetParent(v.RpType,v.RpTypeParent) RPData:SetParent(v.RpType,v.RpTypeParent)
@ -572,6 +573,8 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu) RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu)
--七界试炼 --七界试炼
RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint,FUNCTION_OPEN_TYPE.QIJIESHILIAN) RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint,FUNCTION_OPEN_TYPE.QIJIESHILIAN)
--玉虚论道
RPData:AddCheckFunc(RedPointType.WorldArena_reward,WorldArenaManager.CheckRewardPoint)
RPData:AddCheckFunc(RedPointType.LikeabilityRed,LikabilityManager.CheckRedPot) RPData:AddCheckFunc(RedPointType.LikeabilityRed,LikabilityManager.CheckRedPot)
end end

View File

@ -188,7 +188,7 @@ function this.SetRankingInfo(isTop, isAnim)
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1 } dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1 }
elseif sData.rankType==RANK_TYPE.WORLDARENA then elseif sData.rankType==RANK_TYPE.WORLDARENA then
--rankingData.crossScore --rankingData.crossScore
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1,crossScore=WorldArenaManager.GetNewScore()} dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1,crossScore=myRankData.param2}
elseif sData.rankType == RANK_TYPE.FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK then--战力排行 elseif sData.rankType == RANK_TYPE.FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK then--战力排行
dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1} dData = {rankInfo = {param1 = myRankData.param1},force = myRankData.param1}
@ -314,7 +314,9 @@ function this.SetHeadsInfo(data,root,index,name,level)
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil) UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil)
elseif sData.rankType == RANK_TYPE.WORLDARENA then--玉虚论道 elseif sData.rankType == RANK_TYPE.WORLDARENA then--玉虚论道
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, data.uid,2) NetManager.GetPlayerCrossYxldOneTeamInfoRequest(data.uid,0,function(msg)
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel,data.uid,2,msg)
end)
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.NORMAL,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 else
@ -357,7 +359,9 @@ function this.AddPlayerInfoClick(root,uid,serverName)
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,serverName and serverName or nil) UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,serverName and serverName or nil)
elseif sData.rankType == RANK_TYPE.WORLDARENA then elseif sData.rankType == RANK_TYPE.WORLDARENA then
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2) NetManager.GetPlayerCrossYxldOneTeamInfoRequest(uid,0,function(msg)
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel,uid,2,msg)
end)
elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.NORMAL,serverName and serverName or nil) UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.NORMAL,serverName and serverName or nil)
else else

View File

@ -160,8 +160,10 @@ function TianShuMiJuanMainPanel:RefreshData()
end) end)
if not curData or #curData < 1 then if not curData or #curData < 1 then
self.empty.gameObject:SetActive(true) self.empty.gameObject:SetActive(true)
self.scroll.gameObject:SetActive(false)
else else
self.empty.gameObject:SetActive(false) self.empty.gameObject:SetActive(false)
self.scroll.gameObject:SetActive(true)
self.scroll:SetData(curData,function(index,go) self.scroll:SetData(curData,function(index,go)
self:SetSingleData(go,curData[index],index) self:SetSingleData(go,curData[index],index)
end) end)

View File

@ -19,6 +19,8 @@ local isAnim = false
local _CloseFunc = nil local _CloseFunc = nil
local leftAllTeam={} local leftAllTeam={}
local rightAllTeam={} local rightAllTeam={}
local myOldScore=0
local enOldScore=0
local function OnBeginDrag(self, Pointgo, data) local function OnBeginDrag(self, Pointgo, data)
if state~=1 then if state~=1 then
return return
@ -80,6 +82,10 @@ local function OnEndDrag(self, Pointgo, data)
targetInfo.transform.localPosition=Vector3.New(0,-67,0) targetInfo.transform.localPosition=Vector3.New(0,-67,0)
else else
LogError("targetInfo==nil") LogError("targetInfo==nil")
local target=Util.GetGameObject(self.tempInfo.transform, "Demons")
target.transform:SetParent(self.oldGrid.transform)
target.transform:SetSiblingIndex(1)
target.transform.localPosition=Vector3.New(0,-67,0)
return return
end end
@ -134,6 +140,7 @@ function WorldArenaBattleInfoPanel:InitComponent()
this.enTeamInfo=Util.GetGameObject(self.transform, "BG/enInfo") this.enTeamInfo=Util.GetGameObject(self.transform, "BG/enInfo")
this.effect=Util.GetGameObject(self.transform, "BG/Effect") this.effect=Util.GetGameObject(self.transform, "BG/Effect")
this.effect:SetActive(false) this.effect:SetActive(false)
this.hintTxt=Util.GetGameObject(self.transform, "BG/hintTxt"):GetComponent("Text")
screenAdapte(this.effect) screenAdapte(this.effect)
--我方阵营 --我方阵营
this.leftTeam={} this.leftTeam={}
@ -185,17 +192,23 @@ end
--刷新战斗消耗信息 --刷新战斗消耗信息
function this.RefreshBattleCastInfo() function this.RefreshBattleCastInfo()
local leftTimes = WorldArenaManager.GetFreeTime() if type==1 then
this.btnText.gameObject:SetActive(leftTimes > 0) local leftTimes = WorldArenaManager.GetFreeTime()
this.btnItem.gameObject:SetActive(leftTimes<=0) this.btnText.gameObject:SetActive(leftTimes > 0)
this.btnItemNum.gameObject:SetActive(leftTimes<=0) this.btnItem.gameObject:SetActive(leftTimes<=0)
if leftTimes<=0 then this.btnItemNum.gameObject:SetActive(leftTimes<=0)
local itemId, needNum = WorldArenaManager.GetArenaChallengeCost() if leftTimes<=0 then
local haveNum = BagManager.GetItemCountById(itemId) local itemId, needNum = WorldArenaManager.GetArenaChallengeCost()
this.btnItem.sprite = SetIcon(this.spLoader, itemId) local haveNum = BagManager.GetItemCountById(itemId)
this.btnItemNum.text = "×"..needNum this.btnItem.sprite = SetIcon(this.spLoader, itemId)
this.btnItemNum.color = haveNum < needNum and UIColor.NOT_ENOUGH_RED or UIColor.BTN_TEXT this.btnItemNum.text = "×"..needNum
this.btnItemNum.color = haveNum < needNum and UIColor.NOT_ENOUGH_RED or UIColor.BTN_TEXT
end
else
this.btnText.gameObject:SetActive(true)
this.btnItem.gameObject:SetActive(false)
end end
end end
function WorldArenaBattleInfoPanel:PlayFightAnim(leftList, rightList, num, func) function WorldArenaBattleInfoPanel:PlayFightAnim(leftList, rightList, num, func)
@ -233,6 +246,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
end) end)
Util.AddClick(this.btn_fight, function() Util.AddClick(this.btn_fight, function()
-- 动画中不能再执行 -- 动画中不能再执行
state=2
if isAnim then if isAnim then
return return
end end
@ -258,7 +272,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
local haveNum = BagManager.GetItemCountById(itemId) local haveNum = BagManager.GetItemCountById(itemId)
if haveNum < needNum then if haveNum < needNum then
--UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.yuxulundaoTicket }) --UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.yuxulundaoTicket })
PopupTipPanel.ShowTip("邀请函不足!") PopupTipPanel.ShowTip("挑战券不足!")
return return
end end
end end
@ -268,6 +282,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
isAnim = true isAnim = true
self:PlayFightAnim(this.leftTeam, this.rightTeam, 3, function(index) self:PlayFightAnim(this.leftTeam, this.rightTeam, 3, function(index)
this.ShowBattleState(index,3) this.ShowBattleState(index,3)
state=2
this.playBacks[index]:SetActive(true) this.playBacks[index]:SetActive(true)
if index >= 3 then if index >= 3 then
isAnim = false isAnim = false
@ -280,9 +295,11 @@ function WorldArenaBattleInfoPanel:BindEvent()
end) end)
this.myScore.gameObject:SetActive(true) this.myScore.gameObject:SetActive(true)
this.enScore.gameObject:SetActive(true) this.enScore.gameObject:SetActive(true)
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore this.myScore.text= msg.myScore>0 and "积分 "..myOldScore .."+"..msg.myScore or "积分 "..myOldScore .." "..msg.myScore
this.enScore.text= msg.defScore>0 and "积分 "..enOldScore .."+"..msg.defScore or "积分 "..enOldScore .." "..msg.defScore
-- this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore --this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
WorldArenaManager.SetNewScore(msg.myNewScore) WorldArenaManager.SetNewScore(msg.myNewScore)
WorldArenaManager.SetMyData(msg.myRank,WorldArenaManager.GetchallengeTimes()+1) WorldArenaManager.SetMyData(msg.myRank,WorldArenaManager.GetchallengeTimes()+1)
@ -300,8 +317,11 @@ function WorldArenaBattleInfoPanel:BindEvent()
--回放按钮点击事件 --回放按钮点击事件
for i = 1, #this.playBacks do for i = 1, #this.playBacks do
Util.AddClick(this.playBacks[i],function() Util.AddClick(this.playBacks[i],function()
if state==2 then
return
end
if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then
PopupTipPanel.ShowTip("本场战斗无法回放!") PopupTipPanel.ShowTip("本场战斗无法回放!")
return return
@ -316,13 +336,13 @@ function WorldArenaBattleInfoPanel:BindEvent()
arg.result = realResult arg.result = realResult
arg.blue = {} arg.blue = {}
arg.blue.uid = myInfoData.uid arg.blue.uid = myInfoData.uid
arg.blue.name = myInfoData.name arg.blue.name =PracticeManager.SetNameColor(myInfoData.name,myInfoData.practiceLevel) --myInfoData.name
arg.blue.head = myInfoData.head arg.blue.head = myInfoData.head
arg.blue.frame = myInfoData.headFrame arg.blue.frame = myInfoData.headFrame
arg.blue.deltaScore = myInfoData.myScoreChange arg.blue.deltaScore = myInfoData.myScoreChange
arg.red= {} arg.red= {}
arg.red.uid = enInfoData.uid arg.red.uid = enInfoData.uid
arg.red.name = enInfoData.name arg.red.name =PracticeManager.SetNameColor(enInfoData.name,enInfoData.practiceLevel)--enInfoData.name
arg.red.head = enInfoData.head arg.red.head = enInfoData.head
arg.red.frame = enInfoData.headFrame arg.red.frame = enInfoData.headFrame
arg.red.deltaScore = enInfoData.myScoreChange arg.red.deltaScore = enInfoData.myScoreChange
@ -376,15 +396,19 @@ function WorldArenaBattleInfoPanel:OnOpen(msg,_type,closeFunc,list)
if list then if list then
state=3 state=3
resultList=list resultList=list
else
state=1
end end
if state==1 then if state==1 then
for i = 1, 3 do for i = 1, 3 do
this.playBacks[i]:SetActive(false) this.playBacks[i]:SetActive(false)
this.ShowBattleState(i, state) this.ShowBattleState(i, state)
end end
this.myScore.gameObject:SetActive(false) --this.myScore.gameObject:SetActive(false)
this.enScore.gameObject:SetActive(false) --this.enScore.gameObject:SetActive(false)
this.hintTxt.gameObject:SetActive(true)
elseif state==3 then elseif state==3 then
this.hintTxt.gameObject:SetActive(false)
this.myScore.gameObject:SetActive(true) this.myScore.gameObject:SetActive(true)
this.enScore.gameObject:SetActive(true) this.enScore.gameObject:SetActive(true)
for i = 1, 3 do for i = 1, 3 do
@ -450,10 +474,22 @@ function this.ShowInfo(msg)
end end
end end
if state==3 then if state==3 then
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore if type==1 then
this.myScore.text= msg.myScore>0 and "积分 "..msg.myTeamInfo.crossTeamScore .."+"..msg.myScore or "积分 "..msg.myTeamInfo.crossTeamScore .." "..msg.myScore
this.enScore.text= msg.defScore>0 and "积分 "..msg.defTeamInfo.crossTeamScore .."+"..msg.defScore or "积分 "..msg.defTeamInfo.crossTeamScore .." "..msg.defScore
else
this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
end
this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED
this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
else
myOldScore=msg.myTeamInfo.crossTeamScore
this.myScore.text="积分 "..myOldScore
enOldScore=msg.defTeamInfo.crossTeamScore
this.enScore.text="积分 "..enOldScore
this.myScore.color =Color.New(0.9019,0.76,0.3882,1)
this.enScore.color = Color.New(0.9019,0.76,0.3882,1)
end end
this.SetTeamInfo(this.myTeamInfo,msg.myTeamInfo.crossTeam,1) this.SetTeamInfo(this.myTeamInfo,msg.myTeamInfo.crossTeam,1)
this.SetTeamInfo(this.enTeamInfo,msg.defTeamInfo.crossTeam,2) this.SetTeamInfo(this.enTeamInfo,msg.defTeamInfo.crossTeam,2)
@ -476,7 +512,8 @@ function this.ShowBattleState(index,state)
rightImg.sprite=this.spLoader:LoadSprite("UI_effect_JJC_JieSuan_ShengLi_png_zh") rightImg.sprite=this.spLoader:LoadSprite("UI_effect_JJC_JieSuan_ShengLi_png_zh")
end end
end end
leftImg:GetComponent("PlayFlyAnim"):PlayAnim(true)
rightImg:GetComponent("PlayFlyAnim"):PlayAnim(true)
--end --end
end end
@ -489,7 +526,8 @@ function this.SetTeamInfo(_go,teamData,type)
for index = 1, 3 do for index = 1, 3 do
local go = Util.GetGameObject(_go,"defendbox"..index) local go = Util.GetGameObject(_go,"defendbox"..index)
local data = teamData[index] local data = teamData[index]
local fightTxt=Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text") local fightTxt=Util.GetGameObject(go,"Demons/WarPower/Text"):GetComponent("Text")
fightTxt.text=tostring(data.totalForce)
local teamList ={} local teamList ={}
for i = 1, 6 do for i = 1, 6 do
local aa=Util.GetGameObject(go,"Demons/heroPro ("..i..")") local aa=Util.GetGameObject(go,"Demons/heroPro ("..i..")")

View File

@ -77,7 +77,7 @@ function WorldArenaMainPanel:BindEvent()
for i, enemy in ipairs(this.Enemys) do for i, enemy in ipairs(this.Enemys) do
local challengeBtn = Util.GetGameObject(enemy, "challenge") local challengeBtn = Util.GetGameObject(enemy, "challenge")
Util.AddClick(challengeBtn, function() Util.AddClick(challengeBtn, function()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
PopupTipPanel.ShowTip(Language[10075]) PopupTipPanel.ShowTip(Language[10075])
return return
end end
@ -107,7 +107,7 @@ function WorldArenaMainPanel:BindEvent()
end end
--排行 --排行
Util.AddClick(this.sortBtn, function() Util.AddClick(this.sortBtn, function()
UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[27]) UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[31])
end) end)
-- 刷新按钮 -- 刷新按钮
this._RefreshTimeStemp=0 this._RefreshTimeStemp=0
@ -141,7 +141,7 @@ function WorldArenaMainPanel:BindEvent()
end) end)
-- 奖励按钮 -- 奖励按钮
Util.AddClick(this.RewardBtn, function() Util.AddClick(this.RewardBtn, function()
UIManager.OpenPanel(UIName.WorldArenaRankRewardPanel,myRank) UIManager.OpenPanel(UIName.WorldArenaRankRewardPanel,WorldArenaManager.GetMyRank())
end) end)
--商店按钮 --商店按钮
Util.AddClick(this.StoreBtn, function() Util.AddClick(this.StoreBtn, function()
@ -180,10 +180,15 @@ end
local grid, rankData local grid, rankData
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
local oldScore local oldScore
function WorldArenaMainPanel:OnOpen(...) function WorldArenaMainPanel:OnOpen(msg)
-- 参数保存 -- 参数保存
local args = {...} -- NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg) local isReset=false
if msg.isFirst then
isReset=true
FormationManager.RefreshFormationData(this.CheckTeamDamage)
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",msg.oldMyscore)
end
local currRankId=msg.newLevelId local currRankId=msg.newLevelId
LogError(" newMyscore=="..msg.newMyscore.." oldmyscore=="..msg.oldMyscore) LogError(" newMyscore=="..msg.newMyscore.." oldmyscore=="..msg.oldMyscore)
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore) grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
@ -192,7 +197,7 @@ function WorldArenaMainPanel:OnOpen(...)
if msg.drop and #msg.drop>0 then if msg.drop and #msg.drop>0 then
LogError("有充值奖励") LogError("有充值奖励")
WorldArenaManager.AddReward(msg.drop) WorldArenaManager.AddReward(msg.drop)
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",0)
end end
myRank=msg.myRank myRank=msg.myRank
rewardState=msg.dailyRewardState rewardState=msg.dailyRewardState
@ -216,11 +221,9 @@ function WorldArenaMainPanel:OnOpen(...)
LogError("有升级奖励") LogError("有升级奖励")
WorldArenaManager.AddReward(msg.updrop) WorldArenaManager.AddReward(msg.updrop)
end end
this.CheckIsRankChange(msg.updrop) this.CheckIsRankChange(isReset)
if msg.isFirst then
FormationManager.RefreshFormationData() -- end)
end
end)
end end
@ -236,7 +239,7 @@ function this.SetStarShow(grade,layer)
titleLive.transform:SetParent(this.rankPar.transform) titleLive.transform:SetParent(this.rankPar.transform)
titleLive.transform.localPosition=Vector3.New(0,-600,0) titleLive.transform.localPosition=Vector3.New(0,-600,0)
titleLive.transform.localScale =Vector3.New(1,1,1) titleLive.transform.localScale =Vector3.New(1,1,1)
AddParticleSortLayer(titleLive,layer) SetParticleSortLayer(titleLive,layer)
this.rankName.text=rankData.RankName this.rankName.text=rankData.RankName
--this.RefreshEnemyData() --this.RefreshEnemyData()
this.ShowRewardBoxProgressData() this.ShowRewardBoxProgressData()
@ -284,8 +287,9 @@ function this.ShowRewardBoxProgressData()
NetManager.CrossYuXuLunDaoGetDailyRewardRequest(i, function(msg) NetManager.CrossYuXuLunDaoGetDailyRewardRequest(i, function(msg)
allBoxGetState[i]=2 allBoxGetState[i]=2
--this.ShowRewardBoxProgressData() --this.ShowRewardBoxProgressData()
WorldArenaManager.SetRewardState(i,2)
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function () UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function ()
CheckRedPointStatus(RedPointType.Arena_Reward) CheckRedPointStatus(RedPointType.WorldArena_reward)
end) end)
end) end)
end end
@ -347,12 +351,13 @@ function this:RefreshEnemyData(team)
this.HeadList[i]:SetFrame(EnemyList[i].headFrame) this.HeadList[i]:SetFrame(EnemyList[i].headFrame)
this.HeadList[i]:SetLevel(EnemyList[i].level) this.HeadList[i]:SetLevel(EnemyList[i].level)
this.HeadList[i]:SetScale(Vector3.one*0.8) this.HeadList[i]:SetScale(Vector3.one*0.8)
this.HeadList[i]:SetLayer(this.sortingOrder) this.HeadList[i]:SetLayer(self.sortingOrder)
this.HeadList[i]:SetEffectScale(0.85) this.HeadList[i]:SetEffectScale(0.85)
table.insert(enemyList,EnemyList[i].uid) table.insert(enemyList,EnemyList[i].uid)
Util.AddOnceClick(bg, function() Util.AddOnceClick(bg, function()
LogError("uid=="..EnemyList[i].uid) NetManager.GetPlayerCrossYxldOneTeamInfoRequest(EnemyList[i].uid,0,function(msg)
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1) UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1,msg)
end)
end) end)
end end
end end
@ -390,8 +395,11 @@ function this.CheckIsRankChange(resetData)
local lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore") local lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore")
LogError("lastscore=="..lastScore) LogError("lastscore=="..lastScore)
local aa,oldData=WorldArenaManager.GetRankImgByScore(lastScore) local aa,oldData=WorldArenaManager.GetRankImgByScore(lastScore)
--如果有段位变化就显示段位变化界面
if oldData.Id~=rankData.Id then if oldData.Id~=rankData.Id then
UIManager.OpenPanel(UIName.WorldArenaUpRewardPanel,resetData) UIManager.OpenPanel(UIName.WorldArenaUpRewardPanel,resetData)
else--如果没有段位变化就把最新的记录
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",WorldArenaManager.GetNewScore())
end end
end end
@ -399,27 +407,38 @@ end
-- 打开,重新打开时回调 -- 打开,重新打开时回调
function WorldArenaMainPanel:OnShow() function WorldArenaMainPanel:OnShow()
SoundManager.PlayMusic(SoundConfig.BGM_Arena) SoundManager.PlayMusic(SoundConfig.BGM_Arena)
this.CheckTeamDamage()
end
function WorldArenaMainPanel.CheckTeamDamage()
local allDamage=0 local allDamage=0
for i = 2001, 2003 do for i = 2001, 2003 do
allDamage=allDamage+FormationManager.GetFormationPower(i) allDamage=allDamage+FormationManager.GetFormationPower(i)
end end
this.power.text=allDamage this.power.text=allDamage
end end
function WorldArenaMainPanel:OnSortingOrderChange()
function WorldArenaMainPanel:OnSortingOrderChange(order)
--this.sortingOrder=order
if titleLive then
SetParticleSortLayer(titleLive,self.sortingOrder)
end
end end
--界面关闭时调用(用于子类重写) --界面关闭时调用(用于子类重写)
function WorldArenaMainPanel:OnClose() function WorldArenaMainPanel:OnClose()
CheckRedPointStatus(RedPointType.WorldArena_reward)
end end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)
function WorldArenaMainPanel:OnDestroy() function WorldArenaMainPanel:OnDestroy()
SubUIManager.Close(this.UpView) SubUIManager.Close(this.UpView)
if titleLive then
destroy(titleLive)
titleLive=nil
end
-- 清除红点 -- 清除红点
-- ClearRedPointObject(RedPointType.Arena_Shop) -- ClearRedPointObject(RedPointType.Arena_Shop)
this.spLoader:Destroy() this.spLoader:Destroy()

View File

@ -7,6 +7,7 @@ local oldScore=0
local newScore=0 local newScore=0
local myRankId=0 local myRankId=0
local challengeTime=0 local challengeTime=0
local rewardState = nil
local rewardList={} local rewardList={}
function this.Initialize() function this.Initialize()
rewardList={} rewardList={}
@ -45,6 +46,20 @@ function this.SetMyData(rank,time)
challengeTime=time challengeTime=time
end end
function this.GetMyRank()
return myRankId
end
function this.SetRewardData(data,time)
rewardState=data
challengeTime=time
for i = 1, #data do
LogError("宝箱状态========"..data[1])
end
end
function this.SetOldScore(num) function this.SetOldScore(num)
oldScore=num oldScore=num
end end
@ -87,7 +102,7 @@ end
--根据积分获取段位图标id --根据积分获取段位图标id
function this.GetRankImgByScore(num) function this.GetRankImgByScore(num)
for k, v in ConfigPairs(rankConfig) do for k, v in ConfigPairs(rankConfig) do
if v.ScoreLow<num and v.ScoreUp>=num then if num>=v.ScoreLow and num<=v.ScoreUp then
return v.RankGrade+1,v return v.RankGrade+1,v
end end
end end
@ -109,4 +124,25 @@ function this.SetStarShow(starList, starLv)
end end
end end
--设置奖励状态
function this.SetRewardState(index,state)
if rewardState[index] then
rewardState[index]=state
end
end
--检测玉虚奖励的红点
function this.CheckRewardPoint()
local config=ConfigManager.GetConfigDataByKey(ConfigName.MServerRankConfig,1)
local rewards=config.DailyReward
for i = 1, #rewards do
if rewards[i] then
if challengeTime>=rewards[i][1] and rewardState[i]~=2 then
return true
end
end
end
return false
end
return this return this

View File

@ -147,12 +147,14 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
for i, demon in ipairs(self.Heros[index]) do for i, demon in ipairs(self.Heros[index]) do
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1)) Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))
Util.GetGameObject(demon, "pos"):GetComponent("Image").sprite=self.spLoader:LoadSprite("bd_xinkapaifan"..i)
Util.GetGameObject(demon, "hero"):SetActive(false) Util.GetGameObject(demon, "hero"):SetActive(false)
end end
local allPower=0 local allPower=0
--队伍阵容 --队伍阵容
for i, hero in pairs(data) do for i, hero in pairs(data) do
local heroTid = data[i].heroId local heroTid = data[i].heroId
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
if heroTid then if heroTid then
local heroGo = Util.GetGameObject(self.Heros[index][hero.position], "hero") local heroGo = Util.GetGameObject(self.Heros[index][hero.position], "hero")
local heroData=HeroManager.GetSingleHeroData(heroTid) local heroData=HeroManager.GetSingleHeroData(heroTid)
@ -164,18 +166,10 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
SetHeroIcon(self.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig) SetHeroIcon(self.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
local heroData = {} local heroData = {}
Util.AddOnceClick(frameBtn, function() Util.AddOnceClick(Util.GetGameObject(heroGo, "icon"), function()
LogError("playerid=="..PlayerManager.uid.." heroid=="..hero.heroId.." servername=="..1 .." arrayid=="..2000+index)
-- NetManager.ViewHeroInfoRequest(PlayerManager.uid,hero.heroId,1,2000+index,function(msg)
-- if not hero.heroid then
-- return
-- end
-- heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
-- GoodFriendManager.InitEquipData(msg.equip,heroData)
-- UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
-- end)
local heroData = HeroManager.GetSingleHeroData(hero.heroId) local heroData = HeroManager.GetSingleHeroData(hero.heroId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,false) UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,false)
end) end)

View File

@ -7,6 +7,7 @@ local itemId, needNum
local haveNum=0 local haveNum=0
local time=0 local time=0
local enemyId local enemyId
local curMsg=nil
function WorldArenaOtherTeamPanel:InitComponent() function WorldArenaOtherTeamPanel:InitComponent()
self.spLoader = SpriteLoader.New() self.spLoader = SpriteLoader.New()
self.btnBack = Util.GetGameObject(self.gameObject, "Frame/other/BackBtn") self.btnBack = Util.GetGameObject(self.gameObject, "Frame/other/BackBtn")
@ -61,7 +62,7 @@ function WorldArenaOtherTeamPanel:BindEvent()
end) end)
Util.AddClick(self.btnChallenge, function() Util.AddClick(self.btnChallenge, function()
if time==0 and haveNum<needNum then if time==0 and haveNum<needNum then
PopupTipPanel.ShowTip("邀请函不足!") PopupTipPanel.ShowTip("挑战券不足!")
return return
end end
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,self.playerId,function(msg) NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,self.playerId,function(msg)
@ -83,9 +84,10 @@ function WorldArenaOtherTeamPanel:RemoveListener()
end end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
function WorldArenaOtherTeamPanel:OnOpen(_playerId,_type) function WorldArenaOtherTeamPanel:OnOpen(_playerId,_type,_msg)
self.playerId = _playerId self.playerId = _playerId
type=_type type=_type
curMsg=_msg
end end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写) --界面打开或者重新打开后,界面刷新时调用(用于子类重写)
@ -112,11 +114,11 @@ end
function WorldArenaOtherTeamPanel:Refresh() function WorldArenaOtherTeamPanel:Refresh()
LogError("self.playerid=="..self.playerId) LogError("self.playerid=="..self.playerId)
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg) --NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg)
WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,msg.teamInfo) WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,curMsg.teamInfo)
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{msg.teamInfo.crossTeam[1],msg.teamInfo.crossTeam[2],msg.teamInfo.crossTeam[3]}) WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{curMsg.teamInfo.crossTeam[1],curMsg.teamInfo.crossTeam[2],curMsg.teamInfo.crossTeam[3]})
WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,msg.teamInfo.crossTeam[1].PokemonInfos) WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,curMsg.teamInfo.crossTeam[1].PokemonInfos)
WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,msg.teamInfo.crossTeam[1].sealShow) WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,curMsg.teamInfo.crossTeam[1].sealShow)
if type==1 then if type==1 then
self.btnChallenge:SetActive(true) self.btnChallenge:SetActive(true)
else else
@ -125,7 +127,7 @@ function WorldArenaOtherTeamPanel:Refresh()
ForceRebuildLayout(self.content.transform) ForceRebuildLayout(self.content.transform)
ForceRebuildLayout(self.Frame.transform) ForceRebuildLayout(self.Frame.transform)
end) --end)
end end
--实在不想算了,直接写死吧,毁灭吧 --实在不想算了,直接写死吧,毁灭吧
@ -190,8 +192,8 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
local title = Util.GetGameObject(go,"Title"):GetComponent("Text") local title = Util.GetGameObject(go,"Title"):GetComponent("Text")
local teamList = Util.GetGameObject(go,"TeamList") local teamList = Util.GetGameObject(go,"TeamList")
title.text = string.format( "第%s队",NumToChinese[index]) title.text = string.format( "第%s队",NumToChinese[index])
self:SetImgPos(go,data.totalForce) --self:SetImgPos(go,data.totalForce)
Util.GetGameObject(go,"WarPower/Text"):GetComponent("Text").text=data.totalForce
for i, demon in ipairs(self.teamList[index].heroList) do for i, demon in ipairs(self.teamList[index].heroList) do
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1)) Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))
Util.GetGameObject(demon, "hero"):SetActive(false) Util.GetGameObject(demon, "hero"):SetActive(false)
@ -216,7 +218,7 @@ function WorldArenaOtherTeamPanel:SetTeamInfo(_go,teamData)
if not hero.heroid then if not hero.heroid then
return return
end end
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill) heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill,msg.treeLevel)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId) GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true) UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
end) end)

View File

@ -35,6 +35,7 @@ function WorldArenaRankRewardPanel:InitComponent()
this.tabbox = Util.GetGameObject(self.gameObject, "tabbox") this.tabbox = Util.GetGameObject(self.gameObject, "tabbox")
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack") this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
this.Title = Util.GetGameObject(self.gameObject, "Title"):GetComponent("Text") this.Title = Util.GetGameObject(self.gameObject, "Title"):GetComponent("Text")
this.Title.text="奖励"
this.tipText = Util.GetGameObject(self.gameObject, "content1/tipText"):GetComponent("Text") this.tipText = Util.GetGameObject(self.gameObject, "content1/tipText"):GetComponent("Text")
this.myRank = Util.GetGameObject(self.gameObject, "content1/myRank") this.myRank = Util.GetGameObject(self.gameObject, "content1/myRank")
this.myRankNum = Util.GetGameObject(self.gameObject, "content1/myRank/num"):GetComponent("Text") this.myRankNum = Util.GetGameObject(self.gameObject, "content1/myRank/num"):GetComponent("Text")
@ -171,25 +172,19 @@ function this.RefreshMyInfo()
end end
--获取奖励 --获取奖励
if curRankType == 3 then--竞技场 --if curRankType == 3 then--竞技场
for k,value in ConfigPairs(arenaReward) do for k,value in ConfigPairs(ConfigList[2]) do
if myrank <= 3 then -- if myrank > 3 then
if tabNum == 1 then
rewardList = arenaReward[myrank].DailyReward
elseif tabNum == 2 then
rewardList = arenaReward[myrank].SeasonReward
end
elseif myrank > 3 then
if myrank >= value.MinRank and myrank <= value.MaxRank then if myrank >= value.MinRank and myrank <= value.MaxRank then
if tabNum == 1 then if tabNum == 1 then
rewardList = value.DailyReward rewardList = value.SeasonRewardShow
elseif tabNum == 2 then elseif tabNum == 2 then
rewardList = value.SeasonReward rewardList = value.SeasonRewardShow
end end
end end
end -- end
end end
end --end
--显示奖励 --显示奖励
@ -224,12 +219,16 @@ function this.ShowRewardInfo()
return a.RankId>b.RankId return a.RankId>b.RankId
end) end)
this.arenaBottom.gameObject:SetActive(false) this.arenaBottom.gameObject:SetActive(false)
this.ScrollView:SetRectTransform(Vector2.New(916,1040))
this.ScrollView:SetRectPosition(Vector3.New(0,0,0))
elseif tabNum==2 then elseif tabNum==2 then
this.rankTitle.text="排名" this.rankTitle.text="排名"
for _, configInfo in ConfigPairs(ConfigList[tabNum]) do for _, configInfo in ConfigPairs(ConfigList[tabNum]) do
table.insert(RewardList,configInfo) table.insert(RewardList,configInfo)
end end
this.arenaBottom.gameObject:SetActive(true) this.arenaBottom.gameObject:SetActive(true)
this.ScrollView:SetRectTransform(Vector2.New(916,850))
this.ScrollView:SetRectPosition(Vector3.New(0,100,0))
end end
this.ScrollView:SetData(RewardList, function (index, go) this.ScrollView:SetData(RewardList, function (index, go)

View File

@ -32,12 +32,12 @@ end
--添加事件监听(用于子类重写) --添加事件监听(用于子类重写)
function WorldArenaRecordPopup:AddListener() function WorldArenaRecordPopup:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList) -- Game.GlobalEvent:AddEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList)
end end
--移除事件监听(用于子类重写) --移除事件监听(用于子类重写)
function WorldArenaRecordPopup:RemoveListener() function WorldArenaRecordPopup:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList) --Game.GlobalEvent:RemoveEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList)
end end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
@ -122,8 +122,6 @@ function this.RankNodeAdapter(node, data,index)
local replay = Util.GetGameObject(node, "replay") local replay = Util.GetGameObject(node, "replay")
Util.AddOnceClick(replay, function() Util.AddOnceClick(replay, function()
NetManager.CrossYuXuLunDaoBattleDetailRecordRequest(PlayerManager.uid,index,function(msg) NetManager.CrossYuXuLunDaoBattleDetailRecordRequest(PlayerManager.uid,index,function(msg)
local windData={} local windData={}
--我的队伍 --我的队伍
@ -156,8 +154,12 @@ function this.RankNodeAdapter(node, data,index)
local fightData=fightDataList[i] local fightData=fightDataList[i]
local heroTeam={} local heroTeam={}
heroTeam.team={} heroTeam.team={}
heroTeam.totalForce=msg.recordData.yxldMyForce[i]
LogError("myforce=="..msg.recordData.yxldMyForce[i])
local enTeam={} local enTeam={}
enTeam.team={} enTeam.team={}
enTeam.totalForce=msg.recordData.yxldDefForce[i]
LogError("en force=="..msg.recordData.yxldDefForce[i])
for i = 1, #fightData.heroFightInfos.fightUnitList do for i = 1, #fightData.heroFightInfos.fightUnitList do
local hero=fightData.heroFightInfos.fightUnitList[i] local hero=fightData.heroFightInfos.fightUnitList[i]
local newHero={} local newHero={}
@ -199,7 +201,8 @@ function this.RankNodeAdapter(node, data,index)
windData.fightData=fightDataList windData.fightData=fightDataList
windData.myScore= data.myScoreChange windData.myScore= data.myScoreChange
windData.defScore= data.myScoreChange *-1 windData.defScore= data.myScoreChange *-1
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,data.resultList)
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,msg.recordData.result)
end) end)

View File

@ -75,8 +75,8 @@ function WorldArenaUpRewardPanel:OnOpen(data)
this.rankName.text=rankData.RankName this.rankName.text=rankData.RankName
this.scoreTxt.text=lastScore.."/"..rankData.ScoreUp this.scoreTxt.text=lastScore.."/"..rankData.ScoreUp
this.progress.fillAmount=(lastScore-minScore)/(maxScore-minScore) this.progress.fillAmount=(lastScore-minScore)/(maxScore-minScore)
currRank=rankData.RankGrade --currRank=rankData.RankGrade
this.SetStarShow(rankData.RankLevel,rankData.RankGrade,self.sortingOrder) this.SetStarShow(rankData.RankLevel,rankData.RankGrade+1,self.sortingOrder)
this.StartProgressChange(function() this.StartProgressChange(function()
local callList2 = Stack.New() local callList2 = Stack.New()
local itemRandomDataList={} local itemRandomDataList={}
@ -106,8 +106,13 @@ function this.SetStarShow(star,grade,layer)
currRank=grade currRank=grade
titleLive = poolManager:LoadAsset("fx_duanwei_0"..grade, PoolManager.AssetType.GameObject) titleLive = poolManager:LoadAsset("fx_duanwei_0"..grade, PoolManager.AssetType.GameObject)
titleLive.transform:SetParent(this.rankImg.transform) titleLive.transform:SetParent(this.rankImg.transform)
titleLive.transform.localPosition=Vector3.New(0,-600,0) if grade==5 then
titleLive.transform.localScale =Vector3.New(1,1,1) titleLive.transform.localPosition=Vector3.New(0,-500,0)
titleLive.transform.localScale =Vector3.New(0.8,0.8,1)
else
titleLive.transform.localPosition=Vector3.New(0,-600,0)
titleLive.transform.localScale =Vector3.New(1,1,1)
end
AddParticleSortLayer(titleLive,layer) AddParticleSortLayer(titleLive,layer)
end end
this.rankName.text=rankData.RankName this.rankName.text=rankData.RankName
@ -176,6 +181,7 @@ end
local num=0 local num=0
--走的条数 --走的条数
local walkNum=0 local walkNum=0
local changeNum=1
--开始进度条滚动 --开始进度条滚动
function this.StartProgressChange(func) function this.StartProgressChange(func)
if this.TimeCounter then if this.TimeCounter then
@ -183,9 +189,15 @@ function this.StartProgressChange(func)
end end
local function _TimeUpdate() local function _TimeUpdate()
--降低 --降低
if lastScore<currScore then if lastScore<currScore then
lastScore=lastScore+1 if maxScore-lastScore>15 and currScore-lastScore>15 then
changeNum=12
else
changeNum=1
end
lastScore=lastScore+changeNum
--经验条走到头 --经验条走到头
if lastScore==maxScore+1 then if lastScore==maxScore+1 then
walkNum=walkNum+1 walkNum=walkNum+1
@ -198,7 +210,12 @@ function this.StartProgressChange(func)
end end
end end
else else
lastScore=lastScore-1 if lastScore-minScore>15 and lastScore-currScore>15 then
changeNum=12
else
changeNum=1
end
lastScore=lastScore-changeNum
if lastScore==minScore-1 then if lastScore==minScore-1 then
walkNum=walkNum+1 walkNum=walkNum+1
if RankConfig[lastRankId-1] then if RankConfig[lastRankId-1] then
@ -224,14 +241,13 @@ function this.StartProgressChange(func)
end end
end end
this.TimeCounter = Timer.New(_TimeUpdate,0.05, -1, true) this.TimeCounter = Timer.New(_TimeUpdate,0.005, -1, true)
this.TimeCounter:Start() this.TimeCounter:Start()
end end
function this:OnClose() function this:OnClose()
WorldArenaManager.ClearReward() WorldArenaManager.ClearReward()
LogError("调用关闭界面方法 "..newResore)
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",newResore) PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",newResore)
if this.TimeCounter then if this.TimeCounter then
this.TimeCounter:Stop() this.TimeCounter:Stop()

View File

@ -612,4 +612,9 @@ end
function this:SetRectTransform(scrollSizeDeltaV2) function this:SetRectTransform(scrollSizeDeltaV2)
self.rectTransform.sizeDelta = scrollSizeDeltaV2 self.rectTransform.sizeDelta = scrollSizeDeltaV2
end end
function this:SetRectPosition(scrollSizeDeltaV2)
self.rectTransform.localPosition = scrollSizeDeltaV2
end
return ScrollCycleView return ScrollCycleView