【跨服天梯】bug提交

zhangqiang 2020-12-22 21:04:16 +08:00
parent fff1a9934a
commit fbf9ce6ba8
13 changed files with 204 additions and 36 deletions

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 364, y: 0, z: 364, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1

View File

@ -6825,7 +6825,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "30:30:10\u540E\u5F00\u59CB"
m_Text: "1\u592930\u662F30\u520610\u79D2\u540E\u5F00\u59CB"
--- !u!1 &6542200738891798854
GameObject:
m_ObjectHideFlags: 0
@ -7874,8 +7874,8 @@ 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: 11, y: -70.4}
m_SizeDelta: {x: 800, y: 76}
m_AnchoredPosition: {x: 3, y: -70.4}
m_SizeDelta: {x: 917.8, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7197382919261123197
CanvasRenderer:
@ -7906,7 +7906,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: bb03f2f4d02287e44b6635c139fbf11d, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4

View File

@ -1622,6 +1622,7 @@ PLAYER_INFO_VIEW_TYPE = {
BLACK_REMOVE = 2,
GO_TO_BLACK = 3,
ARENA = 4,
JUPMSERVER = 5,
}
--限时达人 周卡 限时活动 拍脸 异妖直购

View File

@ -154,9 +154,9 @@ CHATINFO_ITEMID_FIELD.number = 14
CHATINFO_ITEMID_FIELD.index = 11
CHATINFO_ITEMID_FIELD.label = 1
CHATINFO_ITEMID_FIELD.has_default_value = false
CHATINFO_ITEMID_FIELD.default_value = 0
CHATINFO_ITEMID_FIELD.type = 5
CHATINFO_ITEMID_FIELD.cpp_type = 1
CHATINFO_ITEMID_FIELD.default_value = ""
CHATINFO_ITEMID_FIELD.type = 9
CHATINFO_ITEMID_FIELD.cpp_type = 9
CHATINFO_TYPE_FIELD.name = "type"
CHATINFO_TYPE_FIELD.full_name = ".rpc.protocols.ChatInfo.type"

View File

@ -155,6 +155,7 @@ FIGHTDATA_MONSTERLIST_FIELD = protobuf.FieldDescriptor();
FIGHTDATA_FIGHTSEED_FIELD = protobuf.FieldDescriptor();
FIGHTDATA_FIGHTMAXTIME_FIELD = protobuf.FieldDescriptor();
FIGHTDATA_FIGHTTYPE_FIELD = protobuf.FieldDescriptor();
FIGHTDATA_FIGHTID_FIELD = protobuf.FieldDescriptor();
EXPLOREDETAIL = protobuf.Descriptor();
EXPLOREDETAIL_ID_FIELD = protobuf.FieldDescriptor();
EXPLOREDETAIL_PROGRESS_FIELD = protobuf.FieldDescriptor();
@ -2049,11 +2050,21 @@ FIGHTDATA_FIGHTTYPE_FIELD.default_value = 0
FIGHTDATA_FIGHTTYPE_FIELD.type = 5
FIGHTDATA_FIGHTTYPE_FIELD.cpp_type = 1
FIGHTDATA_FIGHTID_FIELD.name = "fightId"
FIGHTDATA_FIGHTID_FIELD.full_name = ".rpc.protocols.FightData.fightId"
FIGHTDATA_FIGHTID_FIELD.number = 6
FIGHTDATA_FIGHTID_FIELD.index = 5
FIGHTDATA_FIGHTID_FIELD.label = 1
FIGHTDATA_FIGHTID_FIELD.has_default_value = false
FIGHTDATA_FIGHTID_FIELD.default_value = ""
FIGHTDATA_FIGHTID_FIELD.type = 9
FIGHTDATA_FIGHTID_FIELD.cpp_type = 9
FIGHTDATA.name = "FightData"
FIGHTDATA.full_name = ".rpc.protocols.FightData"
FIGHTDATA.nested_types = {}
FIGHTDATA.enum_types = {}
FIGHTDATA.fields = {FIGHTDATA_HEROFIGHTINFOS_FIELD, FIGHTDATA_MONSTERLIST_FIELD, FIGHTDATA_FIGHTSEED_FIELD, FIGHTDATA_FIGHTMAXTIME_FIELD, FIGHTDATA_FIGHTTYPE_FIELD}
FIGHTDATA.fields = {FIGHTDATA_HEROFIGHTINFOS_FIELD, FIGHTDATA_MONSTERLIST_FIELD, FIGHTDATA_FIGHTSEED_FIELD, FIGHTDATA_FIGHTMAXTIME_FIELD, FIGHTDATA_FIGHTTYPE_FIELD, FIGHTDATA_FIGHTID_FIELD}
FIGHTDATA.is_extendable = false
FIGHTDATA.extensions = {}
EXPLOREDETAIL_ID_FIELD.name = "id"

File diff suppressed because one or more lines are too long

View File

@ -243,6 +243,7 @@ FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD = protobuf.FieldDescriptor();
FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor();
ZEROPLAYERUPDATEINDICATION = protobuf.Descriptor();
GETMISSIONRESPONSE = protobuf.Descriptor();
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor();
REFRESHITEMNUMREQUEST = protobuf.Descriptor();
@ -2695,6 +2696,13 @@ FIVEPLAYERUPDATEINDICATION.enum_types = {}
FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD, FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD, FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD}
FIVEPLAYERUPDATEINDICATION.is_extendable = false
FIVEPLAYERUPDATEINDICATION.extensions = {}
ZEROPLAYERUPDATEINDICATION.name = "ZeroPlayerUpdateIndication"
ZEROPLAYERUPDATEINDICATION.full_name = ".rpc.protocols.ZeroPlayerUpdateIndication"
ZEROPLAYERUPDATEINDICATION.nested_types = {}
ZEROPLAYERUPDATEINDICATION.enum_types = {}
ZEROPLAYERUPDATEINDICATION.fields = {}
ZEROPLAYERUPDATEINDICATION.is_extendable = false
ZEROPLAYERUPDATEINDICATION.extensions = {}
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.name = "userMissionInfo"
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.full_name = ".rpc.protocols.GetMissionResponse.userMissionInfo"
GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.number = 1
@ -4806,6 +4814,7 @@ WorkTechnologyLevelResponse = protobuf.Message(WORKTECHNOLOGYLEVELRESPONSE)
WorkTechnologyResetRequest = protobuf.Message(WORKTECHNOLOGYRESETREQUEST)
WorkTechnologyResetResponse = protobuf.Message(WORKTECHNOLOGYRESETRESPONSE)
WorldLevelIndication = protobuf.Message(WORLDLEVELINDICATION)
ZeroPlayerUpdateIndication = protobuf.Message(ZEROPLAYERUPDATEINDICATION)
blessChooseRequest = protobuf.Message(BLESSCHOOSEREQUEST)
blessChooseResponse = protobuf.Message(BLESSCHOOSERESPONSE)
blessRefresh = protobuf.Message(BLESSREFRESH)

View File

@ -109,6 +109,16 @@ GETPLAYERONETEAMINFOREQUEST_PLAYERID_FIELD = protobuf.FieldDescriptor();
GETPLAYERONETEAMINFOREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
GETPLAYERONETEAMINFORESPONSE = protobuf.Descriptor();
GETPLAYERONETEAMINFORESPONSE_TEAMINFO_FIELD = protobuf.FieldDescriptor();
GETARENARANKREWARDREQUEST = protobuf.Descriptor();
GETARENARANKREWARDREQUEST_GROUPID_FIELD = protobuf.FieldDescriptor();
ARENARANK = protobuf.Descriptor();
ARENARANK_UID_FIELD = protobuf.FieldDescriptor();
ARENARANK_RANK_FIELD = protobuf.FieldDescriptor();
GETARENARANKREWARDRESPONSE = protobuf.Descriptor();
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD = protobuf.FieldDescriptor();
ARENACLEARINFOREQUEST = protobuf.Descriptor();
ARENACLEARINFOREQUEST_GROUP_FIELD = protobuf.FieldDescriptor();
ARENACLEARINFORESPONSE = protobuf.Descriptor();
GETWORLDARENAINFOREQUEST_ISPRO_FIELD.name = "isPro"
GETWORLDARENAINFOREQUEST_ISPRO_FIELD.full_name = ".rpc.world.GetWorldArenaInfoRequest.isPro"
@ -1096,13 +1106,104 @@ GETPLAYERONETEAMINFORESPONSE.enum_types = {}
GETPLAYERONETEAMINFORESPONSE.fields = {GETPLAYERONETEAMINFORESPONSE_TEAMINFO_FIELD}
GETPLAYERONETEAMINFORESPONSE.is_extendable = false
GETPLAYERONETEAMINFORESPONSE.extensions = {}
GETARENARANKREWARDREQUEST_GROUPID_FIELD.name = "groupId"
GETARENARANKREWARDREQUEST_GROUPID_FIELD.full_name = ".rpc.world.GetArenaRankRewardRequest.groupId"
GETARENARANKREWARDREQUEST_GROUPID_FIELD.number = 1
GETARENARANKREWARDREQUEST_GROUPID_FIELD.index = 0
GETARENARANKREWARDREQUEST_GROUPID_FIELD.label = 1
GETARENARANKREWARDREQUEST_GROUPID_FIELD.has_default_value = false
GETARENARANKREWARDREQUEST_GROUPID_FIELD.default_value = 0
GETARENARANKREWARDREQUEST_GROUPID_FIELD.type = 5
GETARENARANKREWARDREQUEST_GROUPID_FIELD.cpp_type = 1
GETARENARANKREWARDREQUEST.name = "GetArenaRankRewardRequest"
GETARENARANKREWARDREQUEST.full_name = ".rpc.world.GetArenaRankRewardRequest"
GETARENARANKREWARDREQUEST.nested_types = {}
GETARENARANKREWARDREQUEST.enum_types = {}
GETARENARANKREWARDREQUEST.fields = {GETARENARANKREWARDREQUEST_GROUPID_FIELD}
GETARENARANKREWARDREQUEST.is_extendable = false
GETARENARANKREWARDREQUEST.extensions = {}
ARENARANK_UID_FIELD.name = "uid"
ARENARANK_UID_FIELD.full_name = ".rpc.world.ArenaRank.uid"
ARENARANK_UID_FIELD.number = 1
ARENARANK_UID_FIELD.index = 0
ARENARANK_UID_FIELD.label = 1
ARENARANK_UID_FIELD.has_default_value = false
ARENARANK_UID_FIELD.default_value = 0
ARENARANK_UID_FIELD.type = 5
ARENARANK_UID_FIELD.cpp_type = 1
ARENARANK_RANK_FIELD.name = "rank"
ARENARANK_RANK_FIELD.full_name = ".rpc.world.ArenaRank.rank"
ARENARANK_RANK_FIELD.number = 2
ARENARANK_RANK_FIELD.index = 1
ARENARANK_RANK_FIELD.label = 1
ARENARANK_RANK_FIELD.has_default_value = false
ARENARANK_RANK_FIELD.default_value = 0
ARENARANK_RANK_FIELD.type = 5
ARENARANK_RANK_FIELD.cpp_type = 1
ARENARANK.name = "ArenaRank"
ARENARANK.full_name = ".rpc.world.ArenaRank"
ARENARANK.nested_types = {}
ARENARANK.enum_types = {}
ARENARANK.fields = {ARENARANK_UID_FIELD, ARENARANK_RANK_FIELD}
ARENARANK.is_extendable = false
ARENARANK.extensions = {}
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.name = "rankInfo"
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.full_name = ".rpc.world.GetArenaRankRewardResponse.rankInfo"
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.number = 1
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.index = 0
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.label = 3
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.has_default_value = false
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.default_value = {}
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.message_type = ARENARANK
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.type = 11
GETARENARANKREWARDRESPONSE_RANKINFO_FIELD.cpp_type = 10
GETARENARANKREWARDRESPONSE.name = "GetArenaRankRewardResponse"
GETARENARANKREWARDRESPONSE.full_name = ".rpc.world.GetArenaRankRewardResponse"
GETARENARANKREWARDRESPONSE.nested_types = {}
GETARENARANKREWARDRESPONSE.enum_types = {}
GETARENARANKREWARDRESPONSE.fields = {GETARENARANKREWARDRESPONSE_RANKINFO_FIELD}
GETARENARANKREWARDRESPONSE.is_extendable = false
GETARENARANKREWARDRESPONSE.extensions = {}
ARENACLEARINFOREQUEST_GROUP_FIELD.name = "group"
ARENACLEARINFOREQUEST_GROUP_FIELD.full_name = ".rpc.world.ArenaClearInfoRequest.group"
ARENACLEARINFOREQUEST_GROUP_FIELD.number = 1
ARENACLEARINFOREQUEST_GROUP_FIELD.index = 0
ARENACLEARINFOREQUEST_GROUP_FIELD.label = 1
ARENACLEARINFOREQUEST_GROUP_FIELD.has_default_value = false
ARENACLEARINFOREQUEST_GROUP_FIELD.default_value = 0
ARENACLEARINFOREQUEST_GROUP_FIELD.type = 5
ARENACLEARINFOREQUEST_GROUP_FIELD.cpp_type = 1
ARENACLEARINFOREQUEST.name = "ArenaClearInfoRequest"
ARENACLEARINFOREQUEST.full_name = ".rpc.world.ArenaClearInfoRequest"
ARENACLEARINFOREQUEST.nested_types = {}
ARENACLEARINFOREQUEST.enum_types = {}
ARENACLEARINFOREQUEST.fields = {ARENACLEARINFOREQUEST_GROUP_FIELD}
ARENACLEARINFOREQUEST.is_extendable = false
ARENACLEARINFOREQUEST.extensions = {}
ARENACLEARINFORESPONSE.name = "ArenaClearInfoResponse"
ARENACLEARINFORESPONSE.full_name = ".rpc.world.ArenaClearInfoResponse"
ARENACLEARINFORESPONSE.nested_types = {}
ARENACLEARINFORESPONSE.enum_types = {}
ARENACLEARINFORESPONSE.fields = {}
ARENACLEARINFORESPONSE.is_extendable = false
ARENACLEARINFORESPONSE.extensions = {}
AddDeathPathRankRequest = protobuf.Message(ADDDEATHPATHRANKREQUEST)
AddDeathPathRankResponse = protobuf.Message(ADDDEATHPATHRANKRESPONSE)
ArenaClearInfoRequest = protobuf.Message(ARENACLEARINFOREQUEST)
ArenaClearInfoResponse = protobuf.Message(ARENACLEARINFORESPONSE)
ArenaRank = protobuf.Message(ARENARANK)
CrossUser = protobuf.Message(CROSSUSER)
DeathPathWorldRewardRequest = protobuf.Message(DEATHPATHWORLDREWARDREQUEST)
DeathPathWorldRewardResponse = protobuf.Message(DEATHPATHWORLDREWARDRESPONSE)
EvertDeathPath = protobuf.Message(EVERTDEATHPATH)
GetArenaRankRewardRequest = protobuf.Message(GETARENARANKREWARDREQUEST)
GetArenaRankRewardResponse = protobuf.Message(GETARENARANKREWARDRESPONSE)
GetDeathPathFirstRequest = protobuf.Message(GETDEATHPATHFIRSTREQUEST)
GetDeathPathFirstResponse = protobuf.Message(GETDEATHPATHFIRSTRESPONSE)
GetDeathPathRewardRequest = protobuf.Message(GETDEATHPATHREWARDREQUEST)

View File

@ -220,7 +220,7 @@ function this.ShowSingleData(go,data,i)
end)
end)
Util.AddOnceClick(cliclBtn,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, nil,data.personInfo.servername)
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.personInfo.servername)
end)
elseif stage == JumpServer_Stage.End and data then
playerInfo:SetActive(true)
@ -241,7 +241,7 @@ function this.ShowSingleData(go,data,i)
end
end)
Util.AddOnceClick(cliclBtn,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, nil,data.personInfo.servername)
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.personInfo.uid, PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.personInfo.servername)
end)
end
end
@ -314,9 +314,9 @@ function this.TimeStampToDateString(second)
local sec = second % 60
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
if day > 0 then
return string.format("%d:%02d:%02d:%02d",day, hour, minute, sec)
return string.format("%d天%02d时%02d分%02d秒",day, hour, minute, sec)
else
return string.format("%02d:%02d:%02d", hour, minute, sec)
return string.format("%02d时%02d分%02d秒", hour, minute, sec)
end
end

View File

@ -223,6 +223,15 @@ function this.JumpServerHightLadderWorshipRedPoint()
-- LogPink("跨服天梯可以膜拜红点false")
return false
end
function this.ZeroRefreshPanel()
LogPink("跨天 跨服天梯膜拜状态刷新")
Timer.New(function()
if UIManager.IsOpen(UIName.JumpServerHightLadderPanel) then
this.GetWorldArenaInfoRequest()
end
end, 3):Start()
end
---------------------------------------------
--跨服天梯结束
---------------------------------------------

View File

@ -13,6 +13,7 @@ function this.RegisterMessage(network)
local socket = network.socket
-- 监听服务器跨天状态N
socket:RegistNetMessage(MessageTypeProto_pb.FIVE_PLAYER_REFLUSH_INDICATION, this.RefreshUpdateIndication)
socket:RegistNetMessage(MessageTypeProto_pb.ZeroPlayerUpdateIndication, this.ZeroRefreshUpdateIndication)
--监听红点推送
socket:RegistNetMessage(MessageTypeProto_pb.SEND_RED_POINT_INDICATION, this.ReceiveRedPoint)
@ -198,7 +199,14 @@ function this.RefreshUpdateIndication(buffer)
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点
end
--服务器零点刷新推送相关任务的状态数据
function this.ZeroRefreshUpdateIndication(buffer)
-- local data = buffer:DataByte()
-- local msg = PlayerInfoProto_pb.FivePlayerUpdateIndication()
-- msg:ParseFromString(data)
LogPink("服务器零点刷新推送相关任务的状态数据")
JumpServerManager.ZeroRefreshPanel()
end
--服务器推送红点信息
function this.ReceiveRedPoint(buffer)
local data = buffer:DataByte()

View File

@ -1214,7 +1214,7 @@ function this.GetAllFightDataRequest(func)
local msg = MapInfoProto_pb.getAllLevelDifficultyInfosResponse()
msg:ParseFromString(data)
--FightManager.InitAllMapPgData(msg.levelDifficultyInfos)
MapTrialManager.RefreshTrialInfo(msg.towerCopyInfo)
-- MapTrialManager.RefreshTrialInfo(msg.towerCopyInfo)
CarbonManager.InitCarbonState(msg.mapInfos)
CarbonManager.InitNormalState(msg.playedGenMapId)
CarbonManager.InitCountDownProcess()

View File

@ -30,6 +30,10 @@ local _ViewConfig = {
formationType = FormationTypeDef.FORMATION_ARENA_DEFEND,
tip = Language[11584],
},
[PLAYER_INFO_VIEW_TYPE.JUPMSERVER] = {
formationType = FormationTypeDef.JUMPSERVER_HIGHTLADDER,
tip = "罗浮争锋防守阵容:",
},
}