【跨服天梯】
parent
ac367a1a0c
commit
bf1f26662a
|
|
@ -983,7 +983,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 958511605947035742}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
|
|
@ -1260,7 +1260,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: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -100}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1121867817464273350
|
||||
|
|
@ -1617,7 +1617,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: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -100}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1524603144576187652
|
||||
|
|
@ -4475,10 +4475,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7192441510342929614}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 539.95, y: -1313.8999}
|
||||
m_SizeDelta: {x: 1079.9, y: 375.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &4649500848733138577
|
||||
GameObject:
|
||||
|
|
@ -4845,10 +4845,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6901070332816326902}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 89.8, y: -468.9}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1650392925381089377
|
||||
CanvasRenderer:
|
||||
|
|
@ -6117,10 +6117,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7192441510342929614}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 539.95, y: -938.5}
|
||||
m_SizeDelta: {x: 1079.9, y: 375.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &5973259858859165284
|
||||
GameObject:
|
||||
|
|
@ -6156,10 +6156,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7192441510342929614}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 539.95, y: -187.7}
|
||||
m_SizeDelta: {x: 1079.9, y: 375.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6279401718912459666
|
||||
GameObject:
|
||||
|
|
@ -7426,10 +7426,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7192441510342929614}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 539.95, y: -563.1}
|
||||
m_SizeDelta: {x: 1079.9, y: 375.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7197382918352075755
|
||||
GameObject:
|
||||
|
|
@ -8048,10 +8048,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6901070332816326902}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 89.8, y: -198.3}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6282843123482655537
|
||||
CanvasRenderer:
|
||||
|
|
@ -8165,10 +8165,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6901070332816326902}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 89.8, y: -604.2}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1449230760945282387
|
||||
CanvasRenderer:
|
||||
|
|
@ -8433,10 +8433,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6901070332816326902}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 89.8, y: -63}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2949949007295888706
|
||||
CanvasRenderer:
|
||||
|
|
@ -8942,10 +8942,10 @@ RectTransform:
|
|||
m_Father: {fileID: 6901070332816326902}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 89.8, y: -333.6}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2766708985732818898
|
||||
CanvasRenderer:
|
||||
|
|
@ -9058,7 +9058,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: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -100}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8373092763190947104
|
||||
|
|
@ -9783,7 +9783,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: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -100}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8987679782802244456
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -23,15 +23,17 @@ GETWORLDARENACHALLENGEREQUEST_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
|
|||
GETWORLDARENACHALLENGEREQUEST_FIGHTTEAMINFO_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGEREQUEST_TOTALFORCE_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE = protobuf.Descriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENAPROUDREQUEST = protobuf.Descriptor();
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENAPROUDRESPONSE = protobuf.Descriptor();
|
||||
GETWORLDARENAPROUDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD = protobuf.FieldDescriptor();
|
||||
GETWORLDARENARECORDINFOREQUEST = protobuf.Descriptor();
|
||||
GETWORLDARENARECORDINFORESPONSE = protobuf.Descriptor();
|
||||
GETWORLDARENARECORDINFORESPONSE_ARENARECORDINFO_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -214,31 +216,21 @@ GETWORLDARENACHALLENGEREQUEST.enum_types = {}
|
|||
GETWORLDARENACHALLENGEREQUEST.fields = {GETWORLDARENACHALLENGEREQUEST_TEAMID_FIELD, GETWORLDARENACHALLENGEREQUEST_CHALLENGESERVERID_FIELD, GETWORLDARENACHALLENGEREQUEST_CHALLENGEUID_FIELD, GETWORLDARENACHALLENGEREQUEST_CHALLENGERANK_FIELD, GETWORLDARENACHALLENGEREQUEST_SKIPFIGHT_FIELD, GETWORLDARENACHALLENGEREQUEST_ARENAENEMYS_FIELD, GETWORLDARENACHALLENGEREQUEST_FIGHTTEAMINFO_FIELD, GETWORLDARENACHALLENGEREQUEST_TOTALFORCE_FIELD}
|
||||
GETWORLDARENACHALLENGEREQUEST.is_extendable = false
|
||||
GETWORLDARENACHALLENGEREQUEST.extensions = {}
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.name = "mySortChange"
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.full_name = ".rpc.world.GetWorldArenaChallengeResponse.mySortChange"
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.number = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.index = 0
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.label = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.has_default_value = false
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.default_value = 0
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.type = 5
|
||||
GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD.cpp_type = 1
|
||||
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.name = "arenaEnemys"
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.full_name = ".rpc.world.GetWorldArenaChallengeResponse.arenaEnemys"
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.number = 2
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.index = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.label = 3
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.has_default_value = false
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.default_value = {}
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.message_type = CommonProto_pb.ARENAENEMY
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.type = 11
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD.cpp_type = 10
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.name = "arenaInfo"
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.full_name = ".rpc.world.GetWorldArenaChallengeResponse.arenaInfo"
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.number = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.index = 0
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.label = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.has_default_value = false
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.default_value = nil
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.message_type = CommonProto_pb.ARENAINFO
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.type = 11
|
||||
GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD.cpp_type = 10
|
||||
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.name = "fightData"
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.full_name = ".rpc.world.GetWorldArenaChallengeResponse.fightData"
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.number = 3
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.index = 2
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.number = 2
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.index = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.label = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.has_default_value = false
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.default_value = nil
|
||||
|
|
@ -248,8 +240,8 @@ GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD.cpp_type = 10
|
|||
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.name = "fightResult"
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.full_name = ".rpc.world.GetWorldArenaChallengeResponse.fightResult"
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.number = 4
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.index = 3
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.number = 3
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.index = 2
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.label = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.has_default_value = false
|
||||
GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.default_value = 0
|
||||
|
|
@ -258,8 +250,8 @@ GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD.cpp_type = 1
|
|||
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.name = "drop"
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.full_name = ".rpc.world.GetWorldArenaChallengeResponse.drop"
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.number = 5
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.index = 4
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.number = 4
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.index = 3
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.label = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.has_default_value = false
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.default_value = nil
|
||||
|
|
@ -267,16 +259,26 @@ GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
|||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.type = 11
|
||||
GETWORLDARENACHALLENGERESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.name = "err"
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.full_name = ".rpc.world.GetWorldArenaChallengeResponse.err"
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.number = 5
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.index = 4
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.label = 1
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.has_default_value = false
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.default_value = 0
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.type = 5
|
||||
GETWORLDARENACHALLENGERESPONSE_ERR_FIELD.cpp_type = 1
|
||||
|
||||
GETWORLDARENACHALLENGERESPONSE.name = "GetWorldArenaChallengeResponse"
|
||||
GETWORLDARENACHALLENGERESPONSE.full_name = ".rpc.world.GetWorldArenaChallengeResponse"
|
||||
GETWORLDARENACHALLENGERESPONSE.nested_types = {}
|
||||
GETWORLDARENACHALLENGERESPONSE.enum_types = {}
|
||||
GETWORLDARENACHALLENGERESPONSE.fields = {GETWORLDARENACHALLENGERESPONSE_MYSORTCHANGE_FIELD, GETWORLDARENACHALLENGERESPONSE_ARENAENEMYS_FIELD, GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD, GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD, GETWORLDARENACHALLENGERESPONSE_DROP_FIELD}
|
||||
GETWORLDARENACHALLENGERESPONSE.fields = {GETWORLDARENACHALLENGERESPONSE_ARENAINFO_FIELD, GETWORLDARENACHALLENGERESPONSE_FIGHTDATA_FIELD, GETWORLDARENACHALLENGERESPONSE_FIGHTRESULT_FIELD, GETWORLDARENACHALLENGERESPONSE_DROP_FIELD, GETWORLDARENACHALLENGERESPONSE_ERR_FIELD}
|
||||
GETWORLDARENACHALLENGERESPONSE.is_extendable = false
|
||||
GETWORLDARENACHALLENGERESPONSE.extensions = {}
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.name = "challengeUid"
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.full_name = ".rpc.world.GetWorldArenaProudRequest.challengeUid"
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.number = 2
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.number = 1
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.index = 0
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.label = 1
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.has_default_value = false
|
||||
|
|
@ -284,11 +286,21 @@ GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.default_value = 0
|
|||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.type = 5
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD.cpp_type = 1
|
||||
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.name = "challengeRank"
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.full_name = ".rpc.world.GetWorldArenaProudRequest.challengeRank"
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.number = 2
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.index = 1
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.label = 1
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.has_default_value = false
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.default_value = 0
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.type = 5
|
||||
GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD.cpp_type = 1
|
||||
|
||||
GETWORLDARENAPROUDREQUEST.name = "GetWorldArenaProudRequest"
|
||||
GETWORLDARENAPROUDREQUEST.full_name = ".rpc.world.GetWorldArenaProudRequest"
|
||||
GETWORLDARENAPROUDREQUEST.nested_types = {}
|
||||
GETWORLDARENAPROUDREQUEST.enum_types = {}
|
||||
GETWORLDARENAPROUDREQUEST.fields = {GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD}
|
||||
GETWORLDARENAPROUDREQUEST.fields = {GETWORLDARENAPROUDREQUEST_CHALLENGEUID_FIELD, GETWORLDARENAPROUDREQUEST_CHALLENGERANK_FIELD}
|
||||
GETWORLDARENAPROUDREQUEST.is_extendable = false
|
||||
GETWORLDARENAPROUDREQUEST.extensions = {}
|
||||
GETWORLDARENAPROUDRESPONSE_DROP_FIELD.name = "drop"
|
||||
|
|
@ -302,11 +314,21 @@ GETWORLDARENAPROUDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
|||
GETWORLDARENAPROUDRESPONSE_DROP_FIELD.type = 11
|
||||
GETWORLDARENAPROUDRESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.name = "err"
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.full_name = ".rpc.world.GetWorldArenaProudResponse.err"
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.number = 2
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.index = 1
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.label = 1
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.has_default_value = false
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.default_value = 0
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.type = 5
|
||||
GETWORLDARENAPROUDRESPONSE_ERR_FIELD.cpp_type = 1
|
||||
|
||||
GETWORLDARENAPROUDRESPONSE.name = "GetWorldArenaProudResponse"
|
||||
GETWORLDARENAPROUDRESPONSE.full_name = ".rpc.world.GetWorldArenaProudResponse"
|
||||
GETWORLDARENAPROUDRESPONSE.nested_types = {}
|
||||
GETWORLDARENAPROUDRESPONSE.enum_types = {}
|
||||
GETWORLDARENAPROUDRESPONSE.fields = {GETWORLDARENAPROUDRESPONSE_DROP_FIELD}
|
||||
GETWORLDARENAPROUDRESPONSE.fields = {GETWORLDARENAPROUDRESPONSE_DROP_FIELD, GETWORLDARENAPROUDRESPONSE_ERR_FIELD}
|
||||
GETWORLDARENAPROUDRESPONSE.is_extendable = false
|
||||
GETWORLDARENAPROUDRESPONSE.extensions = {}
|
||||
GETWORLDARENARECORDINFOREQUEST.name = "GetWorldArenaRecordInfoRequest"
|
||||
|
|
|
|||
|
|
@ -71,9 +71,9 @@ function JumpServerHightLadderPanel:BindEvent()
|
|||
|
||||
Util.AddClick(this.sdBtn,function()
|
||||
--条件判断
|
||||
this.BuyVipFun(function()
|
||||
this.BuyVipFun(1,function()
|
||||
--直接战斗
|
||||
JumpServerManager.StarFightHightLadder(0,0,2,function(msg)
|
||||
JumpServerManager.StarFightHightLadder(nil,1,function(msg)
|
||||
this.RefreshBuyNum()
|
||||
this.OnShowPanel()
|
||||
end)
|
||||
|
|
@ -81,7 +81,7 @@ function JumpServerHightLadderPanel:BindEvent()
|
|||
|
||||
end)
|
||||
Util.AddClick(this.addNumBtn,function()
|
||||
this.BuyVipFun(function()
|
||||
this.BuyVipFun(2,function()
|
||||
this.RefreshBuyNum()
|
||||
end)
|
||||
end)
|
||||
|
|
@ -100,28 +100,22 @@ end
|
|||
--跨服
|
||||
function JumpServerHightLadderPanel:OnOpen()
|
||||
this.UpView:OnOpen({showType = UpViewOpenType.ShowRight, panelType = PanelType.Main})
|
||||
JumpServerManager.GetWorldArenaChallengeRequest()
|
||||
JumpServerManager.GetWorldArenaInfoRequest()
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function JumpServerHightLadderPanel:OnShow(...)
|
||||
this.OnShowPanel()
|
||||
function JumpServerHightLadderPanel:OnShow()
|
||||
end
|
||||
|
||||
|
||||
function this:OnSortingOrderChange()
|
||||
-- Util.AddParticleSortLayer(this.effect, self.sortingOrder - orginLayer)
|
||||
end
|
||||
function this.OnShowPanel()
|
||||
stage = 1--JumpServerManager.GetHightLadderDatastage()
|
||||
stage = JumpServerManager.GetHightLadderDatastage()
|
||||
datas = JumpServerManager.GetHightLadderDataArenaInfo()
|
||||
|
||||
-- this.scrollView:SetData(datas,function(index,go)
|
||||
-- this.ShowSingleData(go,datas[index])
|
||||
-- end)
|
||||
LogPink("datas.arenaEnemys "..#datas.arenaEnemys)
|
||||
for i = 1, 4 do
|
||||
-- this.ShowSingleData(goList[i],datas.arenaEnemys[i],i)
|
||||
this.ShowSingleData(goList[i],nil,i)
|
||||
this.ShowSingleData(goList[i],datas.arenaEnemys[i],i)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -152,11 +146,12 @@ function this.OnShowPanel()
|
|||
this.RemainTimeDown(this.timeText,this.timeText:GetComponent("Text"),JumpServerManager.GetHightLadderDataEndTime(),timeStr)
|
||||
end
|
||||
function this.RefreshBuyNum()
|
||||
this.mianfeiTextl.text = JumpServerManager.GetCanBattleCount()
|
||||
this.mianfeiText.text = JumpServerManager.GetCanBattleCount()
|
||||
this.buyText.text = JumpServerManager.GetCanBuyBattleCount()
|
||||
end
|
||||
function this.ShowSingleData(go,data,i)
|
||||
--data.arenaEnemys.personInfo.name
|
||||
LogPink("data "..data.personInfo.uid)
|
||||
local playerInfo = Util.GetGameObject(go, "playerInfo")
|
||||
local sdBtn = Util.GetGameObject(go, "sdBtn")
|
||||
local sdBtnRedPoint = Util.GetGameObject(go, "sdBtn/redPoint")
|
||||
|
|
@ -183,12 +178,15 @@ function this.ShowSingleData(go,data,i)
|
|||
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,NameManager.roleSex,live)
|
||||
this.LocadPersonInfoLive(go,NameManager.roleSex,live.transform)
|
||||
sdBtnRedPoint:SetActive(JumpServerManager.GetCanBattleCount() > 0)
|
||||
LogPink("0000000000")
|
||||
Util.AddOnceClick(sdBtn,function()
|
||||
this.BuyVipFun(function()
|
||||
LogPink("111111111111111")
|
||||
this.BuyVipFun(1,function()
|
||||
--直接战斗
|
||||
JumpServerManager.StarFightHightLadder(data.personInfo.serverId,data.personInfo.uid,1,function()
|
||||
LogPink("22222222")
|
||||
JumpServerManager.StarFightHightLadder(data.personInfo,0,function(msg)
|
||||
this.RefreshBuyNum()
|
||||
this.OnShowPanel()
|
||||
end)
|
||||
|
|
@ -203,24 +201,12 @@ function this.ShowSingleData(go,data,i)
|
|||
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,NameManager.roleSex,live)
|
||||
this.LocadPersonInfoLive(go,NameManager.roleSex,live.transform)
|
||||
sdBtnRedPoint:SetActive(data.personInfo.worshipTime < 0)
|
||||
Util.AddOnceClick(sdBtn,function()
|
||||
if data.personInfo.worshipTime < 0 then
|
||||
NetManager.GetWorldArenaChallengeRequest(data.personInfo.serverId,data.personInfo.uid,function(msg)
|
||||
local itemId = 0
|
||||
local itemNum = 0
|
||||
if msg.drop.itemlist ~= nil and #msg.drop.itemlist > 0 then
|
||||
for i = 1, #msg.drop.itemlist do
|
||||
if msg.drop.itemlist[i].itemNum > 0 then
|
||||
itemId = msg.drop.itemlist[i].itemId--
|
||||
itemNum = msg.drop.itemlist[i].itemNum
|
||||
end
|
||||
end
|
||||
end
|
||||
PopupTipPanel.ShowTip(string.format("膜拜成功,获得%sX%s!"),ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name, itemNum)
|
||||
-- PopupTipPanel.ShowColorTip(name, icon, num)
|
||||
--刷新界面
|
||||
JumpServerManager.GetWorldArenaProudRequest(data.personInfo,function(msg)
|
||||
this.OnShowPanel()
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
|
@ -233,9 +219,8 @@ function this.LocadPersonInfoLive(go,roleSex,live)
|
|||
end
|
||||
local npc = roleSex == ROLE_SEX.BOY and "live2d_npc_map" or "live2d_npc_map_nv"
|
||||
local scale = roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.16
|
||||
local live2d = poolManager:LoadLive(npc, live,
|
||||
scale, Vector3.zero)
|
||||
local SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic")
|
||||
local live2d = poolManager:LoadLive(npc, live,scale, Vector3.zero)
|
||||
local SkeletonGraphic = live2d:GetComponent("SkeletonGraphic")
|
||||
if SkeletonGraphic then
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
SkeletonGraphic.transform.localEulerAngles = Vector3.New(0, 0, 0)
|
||||
|
|
|
|||
|
|
@ -44,14 +44,14 @@ end
|
|||
--界面打开时调用(用于子类重写)
|
||||
function JumpServerHightLadderRecordPopup:OnOpen(...)
|
||||
-- 请求数据
|
||||
ArenaManager.RequestArenaRecord()
|
||||
-- 刷新显示
|
||||
this.RefreshRecordList()
|
||||
JumpServerManager.GetWorldArenaRecordInfoRequest(function(msg)
|
||||
this.RefreshRecordList(msg)
|
||||
end)
|
||||
end
|
||||
|
||||
-- 刷新记录列表
|
||||
function this.RefreshRecordList()
|
||||
local recordList = ArenaManager.GetRecordList()
|
||||
function this.RefreshRecordList(msg)
|
||||
local recordList = msg
|
||||
if (#recordList<1) then
|
||||
this.roleImage:SetActive(true)
|
||||
else
|
||||
|
|
@ -79,26 +79,35 @@ function this.RankNodeAdapter(node, data)
|
|||
local sortTip = Util.GetGameObject(node, "sortTip")
|
||||
local upImage = Util.GetGameObject(node, "upImage")
|
||||
local downImage = Util.GetGameObject(node, "downImage")
|
||||
local warOrGuard = 0
|
||||
local curShowPersonInfo = nil
|
||||
if curShowPersonInfo.personInfo.uid == PlayerManager.uid then--挑战
|
||||
warOrGuard = 1
|
||||
curShowPersonInfo = data.enemyInfo
|
||||
else--防守
|
||||
warOrGuard = 2
|
||||
curShowPersonInfo = data.myInfo
|
||||
end
|
||||
|
||||
lv_name.text = "lv"..data.attackInfo.personInfo.serverId.." "..data.attackInfo.personInfo.name
|
||||
power.text = Language[10090]..data.attackInfo.personInfo.totalForce
|
||||
time.text = GetDeltaTimeStr(data.attackTime)
|
||||
curSort:GetComponent("Text").text = data.attackInfo.personInfo.score
|
||||
nextSort:GetComponent("Text").text = data.attackInfo.personInfo.worshipTime
|
||||
lv_name.text = "lv"..curShowPersonInfo.personInfo.name--curShowPersonInfo.personInfo.serverId.." "..
|
||||
power.text = Language[10090]..curShowPersonInfo.personInfo.totalForce
|
||||
time.text = GetDeltaTimeStr(data.FightData.fightSeed)
|
||||
curSort:GetComponent("Text").text = data.oldrank
|
||||
nextSort:GetComponent("Text").text = data.rank
|
||||
curSort:SetActive(false)
|
||||
nextSort:SetActive(false)
|
||||
upImage:SetActive(false)
|
||||
downImage:SetActive(false)
|
||||
sortTip:SetActive(false)
|
||||
local isWin = data.fightResult == 1
|
||||
local isWin = (warOrGuard == 1 and data.fightResult == 1) or (warOrGuard == 2 and data.fightResult == 0)
|
||||
local color = isWin and UIColor.GREEN or UIColor.RED
|
||||
curSort:GetComponent("Text").color = color
|
||||
nextSort:GetComponent("Text").color = color
|
||||
if data.attackInfo.personInfo.score > data.attackInfo.personInfo.worshipTime then
|
||||
if data.oldrank > data.rank then
|
||||
upImage:SetActive(true)
|
||||
curSort:SetActive(true)
|
||||
nextSort:SetActive(true)
|
||||
elseif data.attackInfo.personInfo.score == data.attackInfo.personInfo.worshipTime then
|
||||
elseif data.oldrank == data.rank then
|
||||
sortTip:SetActive(true)
|
||||
else
|
||||
downImage:SetActive(true)
|
||||
|
|
@ -111,38 +120,39 @@ function this.RankNodeAdapter(node, data)
|
|||
end
|
||||
_PlayerHeadList[node]:Reset()
|
||||
_PlayerHeadList[node]:SetScale(Vector3.one * 0.8)
|
||||
_PlayerHeadList[node]:SetHead(data.attackInfo.personInfo.head)
|
||||
_PlayerHeadList[node]:SetFrame(data.attackInfo.personInfo.headFrame)
|
||||
_PlayerHeadList[node]:SetHead(curShowPersonInfo.personInfo.head)
|
||||
_PlayerHeadList[node]:SetFrame(curShowPersonInfo.personInfo.headFrame)
|
||||
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
|
||||
_PlayerHeadList[node]:SetEffectScale(0.85)
|
||||
|
||||
local resultStr = isWin and Language[10091] or Language[10092]
|
||||
local resultStr = warOrGuard == 1 and "挑战" or "防守"
|
||||
resultStr = resultStr .. (isWin and "成功" or "失败")
|
||||
result.text = resultStr
|
||||
result.color = color
|
||||
|
||||
-- 给回放按钮添加事件
|
||||
local replay = Util.GetGameObject(node, "replay")
|
||||
Util.AddOnceClick(replay, function()
|
||||
local nameStr = data.attackInfo.personInfo.name.."|"..PlayerManager.nickName
|
||||
local nameStr = curShowPersonInfo.personInfo.name.."|"..PlayerManager.nickName
|
||||
local realResult = (data.fightResult + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果
|
||||
ArenaManager.RequestRecordFightData(realResult, data.id, nameStr, function()
|
||||
this:ClosePanel()
|
||||
--构建显示结果数据(我永远在蓝方)
|
||||
-- local arg = {}
|
||||
-- arg.result = realResult
|
||||
-- arg.blue = {}
|
||||
-- arg.blue.uid = data.attackInfo.personInfo.uid
|
||||
-- arg.blue.name = data.attackInfo.personInfo.name
|
||||
-- arg.blue.head = data.attackInfo.personInfo.head
|
||||
-- arg.blue.frame = data.attackInfo.personInfo.headFrame
|
||||
-- arg.blue.deltaScore = - data.myScoreChange
|
||||
-- arg.red= {}
|
||||
-- arg.red.uid = PlayerManager.uid
|
||||
-- arg.red.name = PlayerManager.nickName
|
||||
-- arg.red.head = PlayerManager.head
|
||||
-- arg.red.frame = PlayerManager.frame
|
||||
-- arg.red.deltaScore = data.myScoreChange
|
||||
-- UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
|
||||
local arg = {}
|
||||
arg.result = realResult
|
||||
arg.blue = {}
|
||||
arg.blue.uid = curShowPersonInfo.personInfo.uid
|
||||
arg.blue.name = curShowPersonInfo.personInfo.name
|
||||
arg.blue.head = curShowPersonInfo.personInfo.head
|
||||
arg.blue.frame = curShowPersonInfo.personInfo.headFrame
|
||||
arg.blue.deltaScore = 0
|
||||
arg.red= {}
|
||||
arg.red.uid = PlayerManager.uid
|
||||
arg.red.name = PlayerManager.nickName
|
||||
arg.red.head = PlayerManager.head
|
||||
arg.red.frame = PlayerManager.frame
|
||||
arg.red.deltaScore = 0
|
||||
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
|
||||
end)
|
||||
end)
|
||||
|
||||
|
|
|
|||
|
|
@ -17,32 +17,41 @@ end
|
|||
--跨服天梯数据
|
||||
---------------------------------------------
|
||||
---初始化
|
||||
function this.GetWorldArenaChallengeRequest()
|
||||
NetManager.GetWorldArenaChallengeRequest(function(_msg)
|
||||
function this.GetWorldArenaInfoRequest()
|
||||
NetManager.GetWorldArenaInfoRequest(function(_msg)
|
||||
this.InithightLadderData(_msg)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.JumpServerHeightLadder.UpdateHeightLadderPanel)
|
||||
end)
|
||||
end
|
||||
function this.InithightLadderData(_msg)
|
||||
LogPink("_msg.arenaInfo "..#_msg.arenaInfo)
|
||||
LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
||||
LogPink("_msg.stage ".._msg.stage)
|
||||
LogPink("_msg.endTime ".._msg.endTime)
|
||||
-- LogPink("_msg.score ".._msg.score)
|
||||
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
|
||||
arenaInfo = _msg.arenaInfo
|
||||
stage = _msg.stage
|
||||
endTime = _msg.endTime
|
||||
myRank = _msg.score
|
||||
myRank = _msg.arenaInfo.score
|
||||
end
|
||||
--推送更新
|
||||
function this.IndicationHightLadderData(_msg)
|
||||
arenaInfo = _msg.arenaInfo
|
||||
stage = _msg.stage
|
||||
endTime = _msg.endTime
|
||||
myRank = _msg.score
|
||||
myRank = _msg.arenaInfo.score
|
||||
LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
||||
LogPink("_msg.stage ".._msg.stage)
|
||||
LogPink("_msg.endTime ".._msg.endTime)
|
||||
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
|
||||
end
|
||||
--战斗更新
|
||||
function this.BattleHightLadderData(_msg)
|
||||
arenaInfo.arenaEnemys = _msg.arenaEnemys
|
||||
myRank = _msg.mySortChange
|
||||
if _msg.arenaInfo and _msg.arenaInfo.arenaEnemys and #_msg.arenaInfo.arenaEnemys > 0 then
|
||||
arenaInfo = _msg.arenaInfo
|
||||
myRank =_msg.arenaInfo.score
|
||||
end
|
||||
LogPink("_msg.arenaInfo.arenaEnemys "..#_msg.arenaInfo.arenaEnemys)
|
||||
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
|
||||
end
|
||||
--获得天梯阶段
|
||||
function this.GetHightLadderDataArenaInfo()
|
||||
|
|
@ -69,26 +78,84 @@ function this.GetCanBuyBattleCount()
|
|||
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM)
|
||||
end
|
||||
--天梯开始战斗
|
||||
function this.StarFightHightLadder(challengeServerid,challengeUid,skipFight,callBack)
|
||||
NetManager.GetWorldArenaChallengeRequest(FormationTypeDef.FORMATION_NORMAL,challengeServerid,challengeUid,skipFight,function (msg)
|
||||
function this.StarFightHightLadder(personInfo,skipFight,callBack)
|
||||
NetManager.GetWorldArenaChallengeRequest(FormationTypeDef.FORMATION_NORMAL,personInfo,skipFight,function (msg)
|
||||
oldMyRank = myRank
|
||||
if skipFight == 1 then--挑战
|
||||
if msg.fightResult == -1 then
|
||||
this.BattleHightLadderData(msg.arenaEnemys)
|
||||
if msg and msg.drop and msg.drop.itemlist and #msg.drop.itemlist > 0 then
|
||||
LogPink(" #msg.drop.itemlist ".. #msg.drop.itemlist)
|
||||
else
|
||||
LogPink(" #msg.drop.itemlist nil ")
|
||||
end
|
||||
if skipFight == 0 then--挑战
|
||||
if msg.err== -1 then
|
||||
this.BattleHightLadderData(msg)
|
||||
PopupTipPanel.ShowTip("无法挑战,目标玩家排名出现变化,已重新匹配对手!")
|
||||
return
|
||||
end
|
||||
this.BattleHightLadderData(msg.arenaEnemys)
|
||||
local fightData = BattleManager.GetBattleServerData(msg)
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.JumpServerhightLadder, callBack)
|
||||
this.BattleHightLadderData(msg)
|
||||
local fightData = BattleManager.GetBattleServerData(msg,1)
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.JumpServerhightLadder, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function()
|
||||
if callBack then
|
||||
callBack(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
)
|
||||
else
|
||||
this.BattleHightLadderData(msg.arenaEnemys)
|
||||
this.BattleHightLadderData(msg)
|
||||
local fightData = BattleManager.GetBattleServerData(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function()
|
||||
if callBack then
|
||||
callBack(msg)
|
||||
end
|
||||
end, 1)
|
||||
end
|
||||
end)
|
||||
end
|
||||
function this.GetWorldArenaProudRequest(personInfo,callBack)
|
||||
NetManager.GetWorldArenaProudRequest(personInfo,function(msg)
|
||||
if msg.err== -1 then
|
||||
this.BattleHightLadderData(msg)
|
||||
PopupTipPanel.ShowTip("无法挑战,目标玩家排名出现变化,已重新匹配对手!")
|
||||
return
|
||||
end
|
||||
local itemId = 0
|
||||
local itemNum = 0
|
||||
if msg.drop.itemlist ~= nil and #msg.drop.itemlist > 0 then
|
||||
for i = 1, #msg.drop.itemlist do
|
||||
if msg.drop.itemlist[i].itemNum > 0 then
|
||||
itemId = msg.drop.itemlist[i].itemId--
|
||||
itemNum = msg.drop.itemlist[i].itemNum
|
||||
end
|
||||
end
|
||||
end
|
||||
PopupTipPanel.ShowTip(string.format("膜拜成功,获得%sX%s!"),ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name, itemNum)
|
||||
--worshipTime
|
||||
for i = 1, #arenaInfo.arenaEnemys do
|
||||
if arenaInfo.arenaEnemys[i] then
|
||||
local curData = arenaInfo.arenaEnemys[i]
|
||||
if personInfo.uid == curData.personInfo.uid then
|
||||
if curData.personInfo and curData.personInfo.worshipTime then
|
||||
curData.personInfo.worshipTime = msg.worshipTime
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
if callBack then
|
||||
callBack(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function this.GetWorldArenaRecordInfoRequest(callBack)
|
||||
NetManager.GetWorldArenaRecordInfoRequest(function(msg)
|
||||
if callBack then
|
||||
callBack(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--剩余免费挑战次数红点
|
||||
function this.JumpServerHightLadderMianFeiNumRedPoint()
|
||||
local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer)
|
||||
|
|
|
|||
|
|
@ -4776,7 +4776,7 @@ function this.ChengeMonsterChooseRequest(activityId,selectId,func)
|
|||
end)
|
||||
end
|
||||
--跨服天梯数据
|
||||
function this.GetWorldArenaChallengeRequest(func)
|
||||
function this.GetWorldArenaInfoRequest(func)
|
||||
local data = gtwprotos.WorldProto_pb.GetWorldArenaInfoRequest()
|
||||
-- data.activityId = id
|
||||
local msg = data:SerializeToString()
|
||||
|
|
@ -4790,14 +4790,16 @@ function this.GetWorldArenaChallengeRequest(func)
|
|||
end)
|
||||
end
|
||||
--跨服天梯挑战
|
||||
function this.GetWorldArenaChallengeRequest2(teamId,challengeServerid,challengeUid,skipFight,func)
|
||||
function this.GetWorldArenaChallengeRequest(teamId,personInfo,skipFight,func)
|
||||
local data = gtwprotos.WorldProto_pb.GetWorldArenaChallengeRequest()
|
||||
data.teamId = teamId
|
||||
data.challengeServerid = challengeServerid
|
||||
data.challengeUid = challengeUid
|
||||
if personInfo then
|
||||
data.teamId = teamId
|
||||
data.challengeUid = personInfo.uid
|
||||
data.challengeRank = personInfo.rank
|
||||
end
|
||||
data.skipFight = skipFight
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetShejiAwardRequest, MessageTypeProto_pb.GetShejiAwardResponse, msg, function(buffer)
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetWorldArenaChallengeRequest, MessageTypeProto_pb.GetWorldArenaChallengeResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = gtwprotos.WorldProto_pb.GetWorldArenaChallengeResponse()
|
||||
msg:ParseFromString(data)
|
||||
|
|
@ -4808,12 +4810,12 @@ function this.GetWorldArenaChallengeRequest2(teamId,challengeServerid,challengeU
|
|||
end
|
||||
|
||||
--跨服天梯膜拜
|
||||
function this.GetWorldArenaChallengeRequest3(challengeServerid,challengeUid,func)
|
||||
function this.GetWorldArenaProudRequest(personInfo,func)
|
||||
local data = gtwprotos.WorldProto_pb.GetWorldArenaProudRequest()
|
||||
data.challengeServerid = challengeServerid
|
||||
data.challengeUid = challengeUid
|
||||
data.challengeUid = personInfo.uid
|
||||
data.challengeRank = personInfo.rank
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetShejiAwardRequest, MessageTypeProto_pb.GetShejiAwardResponse, msg, function(buffer)
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetWorldArenaProudRequest, MessageTypeProto_pb.GetWorldArenaProudResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = gtwprotos.WorldProto_pb.GetWorldArenaProudResponse()
|
||||
msg:ParseFromString(data)
|
||||
|
|
@ -4824,8 +4826,11 @@ function this.GetWorldArenaChallengeRequest3(challengeServerid,challengeUid,func
|
|||
end
|
||||
|
||||
--跨服天梯战斗记录
|
||||
function this.GetWorldArenaChallengeRequest4(func)
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetShejiAwardRequest, MessageTypeProto_pb.GetShejiAwardResponse, nil, function(buffer)
|
||||
function this.GetWorldArenaRecordInfoRequest(func)
|
||||
local data = gtwprotos.WorldProto_pb.GetWorldArenaRecordInfoRequest()
|
||||
-- data.activityId = id
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetWorldArenaRecordInfoRequest, MessageTypeProto_pb.GetWorldArenaRecordInfoResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = gtwprotos.WorldProto_pb.GetWorldArenaRecordInfoResponse()
|
||||
msg:ParseFromString(data)
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ function BattleWinPopup:NextStep()
|
|||
-- 胜利显示本场比赛的表现最好的英雄
|
||||
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
|
||||
-- 打开关卡奖励界面
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function()
|
||||
-- UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function()
|
||||
if _BattleBestPopup then
|
||||
_BattleBestPopup:ClosePanel()
|
||||
end
|
||||
|
|
@ -207,7 +207,7 @@ function BattleWinPopup:NextStep()
|
|||
m_battlePanel:ClosePanel()
|
||||
end
|
||||
self:ClosePanel()
|
||||
end, 1)
|
||||
-- end)
|
||||
local MyRank = JumpServerManager.GetHightLadderDataMyRank()
|
||||
local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank()
|
||||
if MyRank ~= OldMyRank then
|
||||
|
|
@ -215,16 +215,15 @@ function BattleWinPopup:NextStep()
|
|||
elseif MyRank == OldMyRank then
|
||||
PopupTipPanel.ShowTip("挑战成功")
|
||||
end
|
||||
|
||||
end)
|
||||
else
|
||||
-- 打开关卡奖励界面
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function()
|
||||
-- UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function()
|
||||
if m_battlePanel then
|
||||
m_battlePanel:ClosePanel()
|
||||
end
|
||||
self:ClosePanel()
|
||||
end, 1)
|
||||
-- end)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue