Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
50963966fa
|
@ -1725,10 +1725,11 @@ GLOBAL_CHAT_TYPE = {
|
|||
PUBLIC_CHAT_MAX_NUM = 50
|
||||
|
||||
ServerStateDef = {
|
||||
Maintenance = 1,
|
||||
Fluency = 2,
|
||||
Full = 3,
|
||||
Congestion = 4--拥挤,服务器不存在此状态
|
||||
UnSee = 0, -- 不可见
|
||||
Maintenance = 1, -- 维护
|
||||
Fluency = 2, -- 流畅
|
||||
Congestion = 3, -- 拥挤
|
||||
Full = 4, -- 爆满
|
||||
}
|
||||
|
||||
BindPhoneState = {
|
||||
|
@ -1803,6 +1804,7 @@ PLAYER_INFO_VIEW_TYPE = {
|
|||
MIND_DEMON = 5,
|
||||
TSLX = 6,--踏碎凌霄当前排行编队
|
||||
JUPMSERVER = 7,--跨服天梯
|
||||
JUPMSERVER_NORMAL = 8,--跨服主线编队
|
||||
}
|
||||
|
||||
--限时达人 周卡 限时活动 拍脸 异妖直购
|
||||
|
|
|
@ -25,6 +25,7 @@ CHATINFO_SPEED_FIELD = protobuf.FieldDescriptor();
|
|||
CHATINFO_MULTIPLE_FIELD = protobuf.FieldDescriptor();
|
||||
CHATINFO_USERTITLE_FIELD = protobuf.FieldDescriptor();
|
||||
CHATINFO_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
CHATINFO_SERVERNAME_FIELD = protobuf.FieldDescriptor();
|
||||
GETCHATMESSAGEINFOREQUEST = protobuf.Descriptor();
|
||||
GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD = protobuf.FieldDescriptor();
|
||||
GETCHATMESSAGEINFOREQUEST_MESSAGEID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -270,11 +271,21 @@ CHATINFO_PRACTICELEVEL_FIELD.default_value = 0
|
|||
CHATINFO_PRACTICELEVEL_FIELD.type = 5
|
||||
CHATINFO_PRACTICELEVEL_FIELD.cpp_type = 1
|
||||
|
||||
CHATINFO_SERVERNAME_FIELD.name = "serverName"
|
||||
CHATINFO_SERVERNAME_FIELD.full_name = ".rpc.protocols.ChatInfo.serverName"
|
||||
CHATINFO_SERVERNAME_FIELD.number = 24
|
||||
CHATINFO_SERVERNAME_FIELD.index = 21
|
||||
CHATINFO_SERVERNAME_FIELD.label = 1
|
||||
CHATINFO_SERVERNAME_FIELD.has_default_value = false
|
||||
CHATINFO_SERVERNAME_FIELD.default_value = ""
|
||||
CHATINFO_SERVERNAME_FIELD.type = 9
|
||||
CHATINFO_SERVERNAME_FIELD.cpp_type = 9
|
||||
|
||||
CHATINFO.name = "ChatInfo"
|
||||
CHATINFO.full_name = ".rpc.protocols.ChatInfo"
|
||||
CHATINFO.nested_types = {}
|
||||
CHATINFO.enum_types = {}
|
||||
CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD, CHATINFO_USERTITLE_FIELD, CHATINFO_PRACTICELEVEL_FIELD}
|
||||
CHATINFO.fields = {CHATINFO_SENDERID_FIELD, CHATINFO_SENDERNAME_FIELD, CHATINFO_SENDERLEVEL_FIELD, CHATINFO_SENDERVIP_FIELD, CHATINFO_TIMES_FIELD, CHATINFO_MSG_FIELD, CHATINFO_HEAD_FIELD, CHATINFO_FRAME_FIELD, CHATINFO_SOULVAL_FIELD, CHATINFO_MESSAGEID_FIELD, CHATINFO_MESSAGETYPE_FIELD, CHATINFO_ITEMID_FIELD, CHATINFO_TYPE_FIELD, CHATINFO_STARTTIME_FIELD, CHATINFO_ENDTIME_FIELD, CHATINFO_PRIORITYLEVEL_FIELD, CHATINFO_FREQUENCY_FIELD, CHATINFO_SPEED_FIELD, CHATINFO_MULTIPLE_FIELD, CHATINFO_USERTITLE_FIELD, CHATINFO_PRACTICELEVEL_FIELD, CHATINFO_SERVERNAME_FIELD}
|
||||
CHATINFO.is_extendable = false
|
||||
CHATINFO.extensions = {}
|
||||
GETCHATMESSAGEINFOREQUEST_CHATTYPE_FIELD.name = "chatType"
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -410,6 +410,7 @@ RANKREQUEST = protobuf.Descriptor();
|
|||
RANKREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
RANKREQUEST_ACTIVITEID_FIELD = protobuf.FieldDescriptor();
|
||||
RANKREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
|
||||
RANKREQUEST_ISCROSS_FIELD = protobuf.FieldDescriptor();
|
||||
RANKRESPONSE = protobuf.Descriptor();
|
||||
RANKRESPONSE_RANKS_FIELD = protobuf.FieldDescriptor();
|
||||
RANKRESPONSE_MYRANKINFO_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -546,6 +547,9 @@ WELFAREREDPACKETREQUEST = protobuf.Descriptor();
|
|||
USERTITLEADDINDICATION = protobuf.Descriptor();
|
||||
USERTITLEADDINDICATION_DECORATIONID_FIELD = protobuf.FieldDescriptor();
|
||||
USERTITLEADDINDICATION_TIME_FIELD = protobuf.FieldDescriptor();
|
||||
ISCROSSREQUERT = protobuf.Descriptor();
|
||||
ISCROSSRESPONSE = protobuf.Descriptor();
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
|
||||
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".rpc.protocols.ErrorMsgResponse.msg"
|
||||
|
@ -4311,11 +4315,21 @@ RANKREQUEST_INDEX_FIELD.default_value = 0
|
|||
RANKREQUEST_INDEX_FIELD.type = 5
|
||||
RANKREQUEST_INDEX_FIELD.cpp_type = 1
|
||||
|
||||
RANKREQUEST_ISCROSS_FIELD.name = "isCross"
|
||||
RANKREQUEST_ISCROSS_FIELD.full_name = ".rpc.protocols.RankRequest.isCross"
|
||||
RANKREQUEST_ISCROSS_FIELD.number = 4
|
||||
RANKREQUEST_ISCROSS_FIELD.index = 3
|
||||
RANKREQUEST_ISCROSS_FIELD.label = 1
|
||||
RANKREQUEST_ISCROSS_FIELD.has_default_value = false
|
||||
RANKREQUEST_ISCROSS_FIELD.default_value = 0
|
||||
RANKREQUEST_ISCROSS_FIELD.type = 5
|
||||
RANKREQUEST_ISCROSS_FIELD.cpp_type = 1
|
||||
|
||||
RANKREQUEST.name = "RankRequest"
|
||||
RANKREQUEST.full_name = ".rpc.protocols.RankRequest"
|
||||
RANKREQUEST.nested_types = {}
|
||||
RANKREQUEST.enum_types = {}
|
||||
RANKREQUEST.fields = {RANKREQUEST_TYPE_FIELD, RANKREQUEST_ACTIVITEID_FIELD, RANKREQUEST_INDEX_FIELD}
|
||||
RANKREQUEST.fields = {RANKREQUEST_TYPE_FIELD, RANKREQUEST_ACTIVITEID_FIELD, RANKREQUEST_INDEX_FIELD, RANKREQUEST_ISCROSS_FIELD}
|
||||
RANKREQUEST.is_extendable = false
|
||||
RANKREQUEST.extensions = {}
|
||||
RANKRESPONSE_RANKS_FIELD.name = "ranks"
|
||||
|
@ -5524,6 +5538,30 @@ USERTITLEADDINDICATION.enum_types = {}
|
|||
USERTITLEADDINDICATION.fields = {USERTITLEADDINDICATION_DECORATIONID_FIELD, USERTITLEADDINDICATION_TIME_FIELD}
|
||||
USERTITLEADDINDICATION.is_extendable = false
|
||||
USERTITLEADDINDICATION.extensions = {}
|
||||
ISCROSSREQUERT.name = "IsCrossRequert"
|
||||
ISCROSSREQUERT.full_name = ".rpc.protocols.IsCrossRequert"
|
||||
ISCROSSREQUERT.nested_types = {}
|
||||
ISCROSSREQUERT.enum_types = {}
|
||||
ISCROSSREQUERT.fields = {}
|
||||
ISCROSSREQUERT.is_extendable = false
|
||||
ISCROSSREQUERT.extensions = {}
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.name = "isCross"
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.full_name = ".rpc.protocols.IsCrossResponse.isCross"
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.number = 1
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.index = 0
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.label = 1
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.has_default_value = false
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.default_value = 0
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.type = 5
|
||||
ISCROSSRESPONSE_ISCROSS_FIELD.cpp_type = 1
|
||||
|
||||
ISCROSSRESPONSE.name = "IsCrossResponse"
|
||||
ISCROSSRESPONSE.full_name = ".rpc.protocols.IsCrossResponse"
|
||||
ISCROSSRESPONSE.nested_types = {}
|
||||
ISCROSSRESPONSE.enum_types = {}
|
||||
ISCROSSRESPONSE.fields = {ISCROSSRESPONSE_ISCROSS_FIELD}
|
||||
ISCROSSRESPONSE.is_extendable = false
|
||||
ISCROSSRESPONSE.extensions = {}
|
||||
|
||||
ActiveUserMountRequest = protobuf.Message(ACTIVEUSERMOUNTREQUEST)
|
||||
ActiveUserMountResponse = protobuf.Message(ACTIVEUSERMOUNTRESPONSE)
|
||||
|
@ -5596,6 +5634,8 @@ HardStageReportResponse = protobuf.Message(HARDSTAGEREPORTRESPONSE)
|
|||
HardStageRequest = protobuf.Message(HARDSTAGEREQUEST)
|
||||
HardStageResponse = protobuf.Message(HARDSTAGERESPONSE)
|
||||
InviteFriendRequest = protobuf.Message(INVITEFRIENDREQUEST)
|
||||
IsCrossRequert = protobuf.Message(ISCROSSREQUERT)
|
||||
IsCrossResponse = protobuf.Message(ISCROSSRESPONSE)
|
||||
JadeDynastyRefreshIndication = protobuf.Message(JADEDYNASTYREFRESHINDICATION)
|
||||
JadeDynastyRefreshTimeResponse = protobuf.Message(JADEDYNASTYREFRESHTIMERESPONSE)
|
||||
JewelBuildRequest = protobuf.Message(JEWELBUILDREQUEST)
|
||||
|
|
|
@ -9,8 +9,6 @@ GETWORLDSERVERRESPONSE = protobuf.Descriptor();
|
|||
GETWORLDSERVERRESPONSE_IP_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDSERVERRESPONSE_PORT_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDSERVERRESPONSE_GROUP_FIELD = protobuf.FieldDescriptor();
|
||||
GETGLOBALSPLITMAILREQUEST = protobuf.Descriptor();
|
||||
GETGLOBALSPLITMAILRESPONSE = protobuf.Descriptor();
|
||||
|
||||
GETWORLDSERVERREQUEST_SERVERID_FIELD.name = "serverID"
|
||||
GETWORLDSERVERREQUEST_SERVERID_FIELD.full_name = ".rpc.global.GetWorldServerRequest.serverID"
|
||||
|
@ -66,23 +64,7 @@ GETWORLDSERVERRESPONSE.enum_types = {}
|
|||
GETWORLDSERVERRESPONSE.fields = {GETWORLDSERVERRESPONSE_IP_FIELD, GETWORLDSERVERRESPONSE_PORT_FIELD, GETWORLDSERVERRESPONSE_GROUP_FIELD}
|
||||
GETWORLDSERVERRESPONSE.is_extendable = false
|
||||
GETWORLDSERVERRESPONSE.extensions = {}
|
||||
GETGLOBALSPLITMAILREQUEST.name = "GetGlobalSplitMailRequest"
|
||||
GETGLOBALSPLITMAILREQUEST.full_name = ".rpc.global.GetGlobalSplitMailRequest"
|
||||
GETGLOBALSPLITMAILREQUEST.nested_types = {}
|
||||
GETGLOBALSPLITMAILREQUEST.enum_types = {}
|
||||
GETGLOBALSPLITMAILREQUEST.fields = {}
|
||||
GETGLOBALSPLITMAILREQUEST.is_extendable = false
|
||||
GETGLOBALSPLITMAILREQUEST.extensions = {}
|
||||
GETGLOBALSPLITMAILRESPONSE.name = "GetGlobalSplitMailResponse"
|
||||
GETGLOBALSPLITMAILRESPONSE.full_name = ".rpc.global.GetGlobalSplitMailResponse"
|
||||
GETGLOBALSPLITMAILRESPONSE.nested_types = {}
|
||||
GETGLOBALSPLITMAILRESPONSE.enum_types = {}
|
||||
GETGLOBALSPLITMAILRESPONSE.fields = {}
|
||||
GETGLOBALSPLITMAILRESPONSE.is_extendable = false
|
||||
GETGLOBALSPLITMAILRESPONSE.extensions = {}
|
||||
|
||||
GetGlobalSplitMailRequest = protobuf.Message(GETGLOBALSPLITMAILREQUEST)
|
||||
GetGlobalSplitMailResponse = protobuf.Message(GETGLOBALSPLITMAILRESPONSE)
|
||||
GetWorldServerRequest = protobuf.Message(GETWORLDSERVERREQUEST)
|
||||
GetWorldServerResponse = protobuf.Message(GETWORLDSERVERRESPONSE)
|
||||
|
||||
|
|
|
@ -560,10 +560,6 @@ function this.ChatItemAdapter(node, data, isShowTime)
|
|||
end
|
||||
-- 头像添加点击事件
|
||||
Util.AddOnceClick(head.gameObject, function()
|
||||
-- TODO:跨服角色信息待开发
|
||||
if this._CurChannel == CHAT_CHANNEL.JUMP_SERVER then
|
||||
return
|
||||
end
|
||||
-- 自己不做任何操作
|
||||
if data.senderId ~= PlayerManager.uid then
|
||||
this.playerFriend:SetActive(true)
|
||||
|
@ -573,7 +569,11 @@ function this.ChatItemAdapter(node, data, isShowTime)
|
|||
end
|
||||
end
|
||||
--this.ShowPlayerInfo(node, data)
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.senderId)
|
||||
if this._CurChannel == CHAT_CHANNEL.JUMP_SERVER then
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.senderId, PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL, data.serverName)
|
||||
else
|
||||
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.senderId)
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
|
|
|
@ -692,7 +692,10 @@ function this.OnLoginClick()
|
|||
PopupTipPanel.ShowTip("为了保证您的个人隐私和隐私安全,请详细阅读并同意用户协议及隐私政策")
|
||||
return
|
||||
end
|
||||
if LoginManager.state == 0 or LoginManager.state == 1 then
|
||||
-- 只要不是流畅,拥挤,爆满状态就不让登录
|
||||
if LoginManager.state ~= ServerStateDef.Fluency
|
||||
and LoginManager.state ~= ServerStateDef.Congestion
|
||||
and LoginManager.state ~= ServerStateDef.Full then
|
||||
local function reServerCallback(str)
|
||||
if str == nil then
|
||||
return
|
||||
|
@ -703,8 +706,10 @@ function this.OnLoginClick()
|
|||
local data = json.decode(str)
|
||||
---selectServerPart
|
||||
this.SetServerList(data)
|
||||
-- 还是不可进状态则请求
|
||||
if LoginManager.state == 0 or LoginManager.state == 1 then
|
||||
-- 还是不可进状态则提示服务器维护中
|
||||
if LoginManager.state ~= ServerStateDef.Fluency
|
||||
and LoginManager.state ~= ServerStateDef.Congestion
|
||||
and LoginManager.state ~= ServerStateDef.Full then
|
||||
PopupTipPanel.ShowTip(Language[11142])
|
||||
RequestPanel.Hide()
|
||||
else
|
||||
|
|
|
@ -8,6 +8,7 @@ local _ViewConfig = {
|
|||
[PLAYER_INFO_VIEW_TYPE.NORMAL] = {
|
||||
formationType = FormationTypeDef.FORMATION_NORMAL,
|
||||
tip = Language[10933],
|
||||
isAddFriend = true,
|
||||
btnType = {
|
||||
--{name = "举 报", func = 1},
|
||||
{name = Language[11496], func = 2},
|
||||
|
@ -17,6 +18,7 @@ local _ViewConfig = {
|
|||
[PLAYER_INFO_VIEW_TYPE.BLACK_REMOVE] = {
|
||||
formationType = FormationTypeDef.FORMATION_NORMAL,
|
||||
tip = Language[10933],
|
||||
isAddFriend = true,
|
||||
btnType = {
|
||||
{name = Language[11498], func = 4},
|
||||
}
|
||||
|
@ -24,6 +26,7 @@ local _ViewConfig = {
|
|||
[PLAYER_INFO_VIEW_TYPE.GO_TO_BLACK] = {
|
||||
formationType = FormationTypeDef.FORMATION_NORMAL,
|
||||
tip = Language[10933],
|
||||
isAddFriend = true,
|
||||
btnType = {
|
||||
{name = Language[11499], func = 5},
|
||||
}
|
||||
|
@ -31,10 +34,12 @@ local _ViewConfig = {
|
|||
[PLAYER_INFO_VIEW_TYPE.ARENA] = {
|
||||
formationType = FormationTypeDef.FORMATION_ARENA_DEFEND,
|
||||
tip = Language[11500],
|
||||
isAddFriend = true,
|
||||
},
|
||||
[PLAYER_INFO_VIEW_TYPE.MIND_DEMON] = {
|
||||
formationType = FormationTypeDef.MONSTER_CAMP_ATTACK,
|
||||
tip = Language[12306],
|
||||
isAddFriend = true,
|
||||
btnType = {
|
||||
|
||||
}
|
||||
|
@ -42,6 +47,7 @@ local _ViewConfig = {
|
|||
[PLAYER_INFO_VIEW_TYPE.TSLX] = {
|
||||
formationType = FormationTypeDef.FORMATION_TSLX,
|
||||
tip = "挑战阵容",
|
||||
isAddFriend = true,
|
||||
btnType = {
|
||||
|
||||
}
|
||||
|
@ -49,11 +55,20 @@ local _ViewConfig = {
|
|||
[PLAYER_INFO_VIEW_TYPE.JUPMSERVER] = {
|
||||
formationType = FormationTypeDef.JUMPSERVER_HIGHTLADDER,
|
||||
tip = "罗浮争锋阵容:",
|
||||
isAddFriend = false,
|
||||
btnType = {
|
||||
-- {name = "挑战", func = 6},
|
||||
{name = "切磋", func = 6},
|
||||
}
|
||||
},
|
||||
[PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL] = {
|
||||
formationType = FormationTypeDef.FORMATION_NORMAL,
|
||||
tip = Language[10933],
|
||||
isAddFriend = false,
|
||||
btnType = {
|
||||
{name = "切磋", func = 6},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
local curPlayerName = ""
|
||||
|
@ -210,7 +225,7 @@ local titleLiveStr
|
|||
local titleLive
|
||||
function this.RefreshPlayerInfo(data)
|
||||
local curname = ""
|
||||
if this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER and this.serverName then
|
||||
if this.serverName then
|
||||
curname = this.serverName .. " " ..data.name
|
||||
else
|
||||
curname = data.name
|
||||
|
@ -338,7 +353,7 @@ function this.FormationAdapter(teamInfo)
|
|||
end
|
||||
end
|
||||
local len=#teamInfo.PokemonInfos
|
||||
LogError("长度:"..len)
|
||||
-- LogError("长度:"..len)
|
||||
if len>0 then
|
||||
-- this.bgImg.sizeDelta=Vector2.New(900,1024)
|
||||
this.pokemonObj:SetActive(true)
|
||||
|
@ -423,11 +438,11 @@ function this.RefreshBtnShow()
|
|||
this.addFriendBtn:SetActive(false)
|
||||
return
|
||||
end
|
||||
if this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER then
|
||||
this.addFriendBtn:SetActive(false)
|
||||
else
|
||||
this.addFriendBtn:SetActive(true)
|
||||
end
|
||||
this.addFriendBtn:SetActive(this._Config.isAddFriend)
|
||||
-- if this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER then
|
||||
-- else
|
||||
-- this.addFriendBtn:SetActive(true)
|
||||
-- end
|
||||
-- 有按钮显示
|
||||
local btnType = this._Config.btnType
|
||||
this.btnBox:SetActive(true)
|
||||
|
|
Loading…
Reference in New Issue