Merge branch '0功能/跨服天梯' into master_develop

# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua
#	Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua
zhangqiang 2020-12-26 11:45:20 +08:00
commit e38c766348
16 changed files with 242 additions and 143 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

@ -5018,9 +5018,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 117, y: -56}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 234, y: 112}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &698392787
@ -5161,7 +5161,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -59, y: 18.7}
m_SizeDelta: {x: 380, y: 70}
m_SizeDelta: {x: 0, y: 70}
m_Pivot: {x: 1, y: 0}
--- !u!114 &708116011
MonoBehaviour:
@ -5639,10 +5639,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 158, y: -35}
m_SizeDelta: {x: 230, y: 68.95}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 158, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1240811747
CanvasRenderer:
@ -5934,10 +5934,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 300.5, y: -35}
m_SizeDelta: {x: 55, y: 68.95}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 300.5, y: 0}
m_SizeDelta: {x: 0, y: 68.95}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1596169479
CanvasRenderer:
@ -6261,9 +6261,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 56, y: -496.3}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 112, y: 112}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2110103218
@ -26449,7 +26449,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 80, y: 16.20002}
m_AnchoredPosition: {x: 108.19993, y: 16.20002}
m_SizeDelta: {x: 208.26, y: 72.19}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2839595269000931517
@ -26493,7 +26493,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u7B80\u535523-23"
m_Text: 116
LanguageIndex: 10520
--- !u!1 &306905339366579358
GameObject:
@ -31697,9 +31697,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5885637088687318906
@ -32063,9 +32063,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -208.75}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 217.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369
@ -62726,9 +62726,9 @@ RectTransform:
m_Father: {fileID: 3952385394978222417}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -392.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6889475057108059259
@ -73601,8 +73601,8 @@ RectTransform:
m_Father: {fileID: 1043104976139942255}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 2, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
@ -74092,9 +74092,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 53, y: -53}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3791543136630995348
@ -85132,7 +85132,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.4499817, y: 0.46502018}
m_SizeDelta: {x: 0.89996, y: 0.93}
m_Pivot: {x: 0.5, y: 0.5}
@ -91150,10 +91150,10 @@ RectTransform:
m_Father: {fileID: 708116007}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 354, y: -35}
m_SizeDelta: {x: 52, y: 69.49}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 354, y: 0}
m_SizeDelta: {x: 0, y: 69.49}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5594570048363825325
CanvasRenderer:
@ -91420,9 +91420,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 269.44, y: -53}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5575929133019220475
@ -91561,7 +91561,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 55, y: -137}
m_SizeDelta: {x: 322.44, y: 74.5}
m_SizeDelta: {x: 0, y: 74.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5535357721351960960
MonoBehaviour:
@ -107432,7 +107432,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -57.199955, y: -3.600069}
m_AnchoredPosition: {x: -29, y: -3.600069}
m_SizeDelta: {x: 215.97, y: 69.44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6067891910948680267
@ -107666,9 +107666,9 @@ RectTransform:
m_Father: {fileID: 1012972711}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 101.75, y: -276.15}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 203.5, y: 308.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5423471315474658513
@ -109227,9 +109227,9 @@ RectTransform:
m_Father: {fileID: 3814890933284291651}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 161.22, y: -53}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 106, y: 106}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7914440216826683292
@ -136140,6 +136140,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5391497229806396012}
m_Modifications:
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_LocalPosition.x
@ -136245,11 +136250,6 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_Name
value: UI_Effect_MuBiaoJiangLi
objectReference: {fileID: 0}
- target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf,
type: 3}
propertyPath: m_IsActive

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:
@ -7899,14 +7899,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
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

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

View File

@ -83,8 +83,11 @@ USETOWERBUFFREQUEST_OPTIONID_FIELD = protobuf.FieldDescriptor();
USETOWERBUFFRESPONSE = protobuf.Descriptor();
USETOWERBUFFRESPONSE_EVENTBEHAVIORCOMMON_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE = protobuf.Descriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD = protobuf.FieldDescriptor();
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD = protobuf.FieldDescriptor();
MAPGETRANKINFOREQUEST = protobuf.Descriptor();
MAPGETRANKINFOREQUEST_MAPID_FIELD = protobuf.FieldDescriptor();
MAPRANKINFO = protobuf.Descriptor();
@ -119,7 +122,6 @@ MAPTOWERUSEBOMBRESPONSE = protobuf.Descriptor();
MAPTOWERUSEBOMBRESPONSE_ESSENCEVALUE_FIELD = protobuf.FieldDescriptor();
MAPTOWERUSEBOMBRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
MAPTOWERUSEBOMBRESPONSE_CELL_FIELD = protobuf.FieldDescriptor();
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD = protobuf.FieldDescriptor();
DIFFICULTMAPREQUEST = protobuf.Descriptor();
DIFFICULTMAPREQUEST_MAPINFO_FIELD = protobuf.FieldDescriptor();
TOWERREWARDREQUEST = protobuf.Descriptor();
@ -973,31 +975,64 @@ USETOWERBUFFRESPONSE.enum_types = {}
USETOWERBUFFRESPONSE.fields = {USETOWERBUFFRESPONSE_EVENTBEHAVIORCOMMON_FIELD}
USETOWERBUFFRESPONSE.is_extendable = false
USETOWERBUFFRESPONSE.extensions = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.name = "killCount"
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse.killCount"
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.number = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.index = 0
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.label = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.default_value = 0
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.type = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD.cpp_type = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.name = "levelDifficultyInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse.levelDifficultyInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.number = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.index = 0
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.default_value = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.message_type = CommonProto_pb.LEVELDIFFICULTYINFOS
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.type = 11
GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.cpp_type = 10
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.name = "trialRewardInfo"
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse.trialRewardInfo"
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.number = 2
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.index = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.default_value = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.type = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD.cpp_type = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.name = "mapInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse.mapInfos"
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.number = 2
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.index = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.default_value = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.message_type = CommonProto_pb.MAPINFO
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.type = 11
GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD.cpp_type = 10
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.name = "starNum"
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse.starNum"
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.number = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.index = 2
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.label = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.default_value = 0
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.type = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD.cpp_type = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.name = "playedGenMapId"
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse.playedGenMapId"
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.number = 4
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.index = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.default_value = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.type = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD.cpp_type = 1
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.name = "difficultMapOptions"
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse.difficultMapOptions"
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.number = 5
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.index = 4
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.label = 3
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.has_default_value = false
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.default_value = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.message_type = DIFFICULTMAPOPTION
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.type = 11
GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD.cpp_type = 10
GETALLLEVELDIFFICULTYINFOSRESPONSE.name = "getAllLevelDifficultyInfosResponse"
GETALLLEVELDIFFICULTYINFOSRESPONSE.full_name = ".rpc.protocols.getAllLevelDifficultyInfosResponse"
GETALLLEVELDIFFICULTYINFOSRESPONSE.nested_types = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE.enum_types = {}
GETALLLEVELDIFFICULTYINFOSRESPONSE.fields = {GETALLLEVELDIFFICULTYINFOSRESPONSE_KILLCOUNT_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_TRIALREWARDINFO_FIELD}
GETALLLEVELDIFFICULTYINFOSRESPONSE.fields = {GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_STARNUM_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_PLAYEDGENMAPID_FIELD, GETALLLEVELDIFFICULTYINFOSRESPONSE_DIFFICULTMAPOPTIONS_FIELD}
GETALLLEVELDIFFICULTYINFOSRESPONSE.is_extendable = false
GETALLLEVELDIFFICULTYINFOSRESPONSE.extensions = {}
MAPGETRANKINFOREQUEST_MAPID_FIELD.name = "mapId"
@ -1310,21 +1345,11 @@ MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.message_type = CommonProto_pb.CELL
MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.type = 11
MAPTOWERUSEBOMBRESPONSE_CELL_FIELD.cpp_type = 10
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.name = "monsterNum"
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.full_name = ".rpc.protocols.MapTowerUseBombResponse.monsterNum"
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.number = 4
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.index = 3
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.label = 1
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.has_default_value = false
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.default_value = 0
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.type = 5
MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD.cpp_type = 1
MAPTOWERUSEBOMBRESPONSE.name = "MapTowerUseBombResponse"
MAPTOWERUSEBOMBRESPONSE.full_name = ".rpc.protocols.MapTowerUseBombResponse"
MAPTOWERUSEBOMBRESPONSE.nested_types = {}
MAPTOWERUSEBOMBRESPONSE.enum_types = {}
MAPTOWERUSEBOMBRESPONSE.fields = {MAPTOWERUSEBOMBRESPONSE_ESSENCEVALUE_FIELD, MAPTOWERUSEBOMBRESPONSE_DROP_FIELD, MAPTOWERUSEBOMBRESPONSE_CELL_FIELD, MAPTOWERUSEBOMBRESPONSE_MONSTERNUM_FIELD}
MAPTOWERUSEBOMBRESPONSE.fields = {MAPTOWERUSEBOMBRESPONSE_ESSENCEVALUE_FIELD, MAPTOWERUSEBOMBRESPONSE_DROP_FIELD, MAPTOWERUSEBOMBRESPONSE_CELL_FIELD}
MAPTOWERUSEBOMBRESPONSE.is_extendable = false
MAPTOWERUSEBOMBRESPONSE.extensions = {}
DIFFICULTMAPREQUEST_MAPINFO_FIELD.name = "mapInfo"

View File

@ -15,7 +15,7 @@ function this.GetFormationIndex()
return FormationTypeDef.JUMPSERVER_HIGHTLADDER
end
--- 提交按钮点击事件
function this.On_Btn1_Click()
function this.On_Btn2_Click()
local formation = FormationManager.GetFormationByID(FormationTypeDef.JUMPSERVER_HIGHTLADDER)
if #formation.teamHeroInfos == 0 then
PopupTipPanel.ShowTip(Language[10711])
@ -35,12 +35,17 @@ end
--
function this.InitView()
this.root.bg:SetActive(true)
this.root.btn_1:SetActive(true)
this.root.btn_1_lab.text = Language[10712]
this.root.btn_2:SetActive(true)
this.root.btn_2_lab.text = Language[10726]
this.root.btn_1:SetActive(true)
this.root.btn_1_lab.text = Language[10743]
this.root.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.JumpServerHightLadder })
end
function this.On_Btn1_Click()
this.root.SetOneKeyGo()
end
return this

View File

@ -103,6 +103,7 @@ end
--跨服
function JumpServerHightLadderPanel:OnOpen()
FormationManager.GetFormationByID(FormationTypeDef.JUMPSERVER_HIGHTLADDER)
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.JumpServerHightLadder})
this.RefreshOnOpen()
isFirstRefresh = false
@ -110,6 +111,13 @@ end
--界面打开时调用(用于子类重写)
function JumpServerHightLadderPanel:OnShow()
local timeStr = "后开始"
if stage == JumpServer_Stage.Attack then
timeStr = "后结束"
elseif stage == JumpServer_Stage.End then
timeStr = "后开始"
end
this.RemainTimeDown(this.timeText,this.timeText:GetComponent("Text"),JumpServerManager.GetHightLadderDataEndTime(),timeStr)
end
function JumpServerHightLadderPanel.RefreshOnOpen()
JumpServerManager.GetWorldArenaInfoRequest()
@ -139,6 +147,7 @@ function this.OnShowPanel()
if stage == JumpServer_Stage.NoStar then
this.canPlayerTipText:SetActive(true)
elseif stage == JumpServer_Stage.Attack then
timeStr = "后结束"
if enterable then
this.mySortText:SetActive(true)
this.sdBtn:SetActive(true)
@ -146,21 +155,19 @@ function this.OnShowPanel()
local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+"
this.mySortText:GetComponent("Text").text = "我的排名:".. myRank
this.RefreshBuyNum()
timeStr = "后结束"
else
this.canPlayerTipText:SetActive(true)
end
elseif stage == JumpServer_Stage.End then
this.canPlayerTipText:GetComponent("Text").text = "已通过邮件发放排名奖励"
timeStr = "后开始"
if enterable then
this.canPlayerTipText:GetComponent("Text").text = "已通过邮件发放排名奖励"
local myRank = JumpServerManager.GetHightLadderDataMyRank() <= 1000 and JumpServerManager.GetHightLadderDataMyRank() or "1000+"
this.mySortText:GetComponent("Text").text = "我的排名:".. myRank
timeStr = "后开始"
this.canPlayerTipText:SetActive(true)
this.mySortText:SetActive(true)
else
this.canPlayerTipText:SetActive(true)
end
this.canPlayerTipText:SetActive(true)
end
this.RemainTimeDown(this.timeText,this.timeText:GetComponent("Text"),JumpServerManager.GetHightLadderDataEndTime(),timeStr)
end
@ -219,18 +226,18 @@ 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)
sdBtn:SetActive(true)
LogPink("data.personInfo.name "..data.personInfo.name.." data.personInfo.rank "..data.personInfo.rank)
LogPink("data.personInfo.name "..data.personInfo.name.." data.personInfo.rank "..data.personInfo.rank.." data.hadProud "..tostring(data.hadProud))
Util.GetGameObject(go, "sdBtn/Text"):GetComponent("Text").text = not data.hadProud and "膜 拜" or data.worshipTime
Util.GetGameObject(go, "playerInfo/name/nameText"):GetComponent("Text").text = data.personInfo.servername.." "..data.personInfo.name
Util.GetGameObject(go, "playerInfo/warPower/powerBtn/value"):GetComponent("Text").text = data.personInfo.totalForce
Util.GetGameObject(go, "playerInfo/warPower/Text"):GetComponent("Text").text = "".. data.personInfo.rank ..""
local live = Util.GetGameObject(go, "playerInfo/live")
this.LocadPersonInfoLive(go,0,live.transform)--NameManager.roleSex
this.LocadPersonInfoLive(go,data.personInfo.gender,live.transform)--NameManager.roleSex
sdBtnRedPoint:SetActive(not data.hadProud)
Util.AddOnceClick(sdBtn,function()
if not data.hadProud then
@ -240,7 +247,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
@ -313,9 +320,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
@ -347,15 +354,37 @@ function this.BuyVipFun(type,warOrSd,fun)
end
else
if fun then
fun ()
if warOrSd == 1 then
if fun then
fun ()
end
else
MsgPanel.ShowTwo("扫荡后可直接获得挑战奖励并保持当前排名,确定消耗一次挑战次数进行扫荡?", nil, function()
if fun then
fun ()
end
end)
end
end
elseif type == 2 then
UIManager.OpenPanel(UIName.ShopBuyPopup, 7,10035,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM, 1)--更新特权
this.RefreshBuyNum()
end)
if JumpServerManager.GetCanBuyBattleCount() <= 0 then
PopupTipPanel.ShowTip("今日已无购买剩余次数!")
else
local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP, JumpServerManager.shopGoodId, 1)
local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name
local tipStr = "是否花费%s%s购买1次挑战次数"
MsgPanel.ShowTwo(string.format( tipStr,finalNum,itemName), nil, function()
--买东西
if finalNum > BagManager.GetItemCountById(costId) then
PopupTipPanel.ShowTip(string.format(Language[11652],itemName))
return
end
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,JumpServerManager.shopGoodId,1,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM, 1)--更新特权
this.RefreshBuyNum()
end)
end)
end
end
end

View File

@ -137,7 +137,7 @@ function this.RankNodeAdapter(node, data)
local realResult = (data.result + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果
local fightData = BattleManager.GetBattleServerData(data, 1)
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.BACK, function()
this:ClosePanel()
-- this:ClosePanel()
end)
end)

View File

@ -119,10 +119,10 @@ function this.SetGoldExperSortInfo()
else
sortNumTabs[4]:SetActive(true)
LogError("rewardData.MaxRank "..rewardData.MaxRank.." "..myData.rank)
if rewardData.MaxRank < 0 then
if rewardData.MaxRank < 0 or rewardData.MaxRank >= 999999 then
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rewardData.MinRank .."+"
else
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rewardData.MinRank .."-".. rewardData.MaxRank
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = myData.rank--rewardData.MinRank .."-".. rewardData.MaxRank
end
end
local content = Util.GetGameObject(this.myActivityRewardGo, "Demons")

View File

@ -17,6 +17,15 @@ end
---------------------------------------------
--跨服天梯数据
---------------------------------------------
------登录初始化
function this.LoginGetWorldArenaInfoRequest(fun)
NetManager.GetWorldArenaInfoRequest(function(_msg)
this.InithightLadderData(_msg)
if fun then
fun()
end
end)
end
---初始化
function this.GetWorldArenaInfoRequest(fun)
NetManager.GetWorldArenaInfoRequest(function(_msg)
@ -179,15 +188,16 @@ function this.JumpServerHightLadderMianFeiNumRedPoint()
return false
end
if not this.GetHightLadderDataEnterable() then
-- LogPink("跨服天梯剩余免费挑战次数红点false")
return false
end
if stage == 2 then
if this.GetCanBattleCount() > 0 then
LogPink("跨服天梯剩余免费挑战次数红点true")
-- LogPink("跨服天梯剩余免费挑战次数红点true")
return true
end
end
LogPink("跨服天梯剩余免费挑战次数红点false")
-- LogPink("跨服天梯剩余免费挑战次数红点false")
return false
end
--跨服天梯可以膜拜红点
@ -203,16 +213,25 @@ function this.JumpServerHightLadderWorshipRedPoint()
local datas = this.GetHightLadderDataArenaInfo()
for i = 1, #datas.arenaEnemys do
if datas.arenaEnemys[i] and datas.arenaEnemys[i].worshipTime and datas.arenaEnemys[i].worshipTime <= 0 then
LogPink("跨服天梯可以膜拜红点true")
if datas.arenaEnemys[i] and not datas.arenaEnemys[i].hadProud then
-- LogPink("跨服天梯可以膜拜红点true")
return true
end
end
end
LogPink("跨服天梯可以膜拜红点false")
-- 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

@ -72,7 +72,6 @@ function JumpServerPanel:BindEvent()
end)
for i = 1, #type do
if type[i].redPointType and carbons[i] then
LogPink("carbonsRedPoint[i] "..carbonsRedPoint[i].transform.name)
BindRedPointObject(type[i].redPointType, carbonsRedPoint[i])
end
end
@ -89,17 +88,17 @@ end
--跨服
function JumpServerPanel:OnOpen()
this.UpView:OnOpen({showType = UpViewOpenType.ShowRight, panelType = PanelType.Main})
-- JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint()
JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint()
end
--界面打开时调用(用于子类重写)
function JumpServerPanel:OnShow(...)
-- for i = 1, #type do
-- if type[i].redPointType and carbons[i] then
-- CheckRedPointStatus(type[i].redPointType)
-- end
-- end
JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint()
for i = 1, #type do
if type[i].redPointType and carbons[i] then
CheckRedPointStatus(type[i].redPointType)
end
end
-- JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint()
this.UpdateCarbonContent()
-- 音效
-- SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
@ -148,7 +147,8 @@ end
function this.BtnClick(id)
if id == JumpServer_Type.HightLadder then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁
PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(JumpServer_Type.HightLadder))
-- PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(JumpServer_Type.HightLadder))
PopupTipPanel.ShowTip("赛季过渡中!")
return
end
local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel
@ -177,6 +177,11 @@ end
--界面关闭时调用(用于子类重写)
function JumpServerPanel:OnClose()
end
--界面销毁时调用(用于子类重写)
function JumpServerPanel:OnDestroy()
carbons = {}
for i = 1, #type do
if type[i].redPointType and carbons[i] then
ClearRedPointObject(type[i].redPointType, carbonsRedPoint[i])
@ -184,9 +189,4 @@ function JumpServerPanel:OnClose()
end
end
--界面销毁时调用(用于子类重写)
function JumpServerPanel:OnDestroy()
carbons = {}
end
return JumpServerPanel

View File

@ -486,8 +486,9 @@ function this.ExecuteLoading()
--[[[33] =]] function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end,
--[[[34] =]] function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end,
--[[[34] =]] function() XiaoYaoManager.GetOpenMapData(LoadingPanel.OnStep) end,
function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end,
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
--[[[35] =]] function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end,
--[[[36] =]] function() JumpServerManager.LoginGetWorldArenaInfoRequest(LoadingPanel.OnStep) end,
--[[[37] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
if AppConst.isGuide then
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) then

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)
@ -200,7 +201,14 @@ function this.RefreshUpdateIndication(buffer)
PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点
GuildTranscriptManager.SetCanSweep1()
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

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

View File

@ -214,8 +214,11 @@ function this.SetHeadsInfo(data,root,index,name,level)
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
end
Util.AddOnceClick(this.firstheadClick,function()
LogGreen("data.serverName "..data.serverName)
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,nil,data.serverName and data.serverName or nil)
local infoType = nil
if sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then
infoType = PLAYER_INFO_VIEW_TYPE.JUPMSERVER
end
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,infoType,data.serverName and data.serverName or nil)
end)
end
@ -245,7 +248,11 @@ end
function this.AddPlayerInfoClick(root,uid)
local clickBtn=Util.GetGameObject(root,"ClickBtn")
Util.AddOnceClick(clickBtn,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid)
local infoType = nil
if sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then
infoType = PLAYER_INFO_VIEW_TYPE.JUPMSERVER
end
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,infoType)
end)
end
--设置自身背景

View File

@ -53,6 +53,10 @@ function ShopBuyPopup:BindEvent()
ShopManager.RequestBuyShopItem(this.shopType, this.shopItemId, count, function()
self:ClosePanel()
if this.backFun then
this.backFun(count)
this.backFun = nil
end
end)
end)
@ -183,10 +187,6 @@ end
--界面关闭时调用(用于子类重写)
function ShopBuyPopup:OnClose()
if this.backFun then
this.backFun()
this.backFun = nil
end
end
--界面销毁时调用(用于子类重写)