Merge branch '0功能/玉虚论道' into 0功能/七界试炼

# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
dev_chengFeng
ZhangBiao 2021-09-10 10:33:44 +08:00
commit 2d003aaafd
21 changed files with 19273 additions and 17435 deletions

View File

@ -2166,6 +2166,85 @@ RectTransform:
m_AnchoredPosition: {x: 1.9000015, y: 0.0000076293945}
m_SizeDelta: {x: 99.7, y: 29.09}
m_Pivot: {x: 0, y: 0}
--- !u!1 &986886272692340427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7236035587429049075}
- component: {fileID: 5736121182784742389}
- component: {fileID: 2893881986781171993}
m_Layer: 0
m_Name: num
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7236035587429049075
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 986886272692340427}
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: []
m_Father: {fileID: 124666416754824053}
m_RootOrder: 0
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: 117.8, y: 0}
m_SizeDelta: {x: 53.2, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5736121182784742389
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 986886272692340427}
m_CullTransparentMesh: 0
--- !u!114 &2893881986781171993
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 986886272692340427}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.08627451, g: 0.12156863, b: 0.14901961, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: x1
--- !u!1 &1017686332888698464
GameObject:
m_ObjectHideFlags: 0
@ -3290,7 +3369,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10.025002, y: 0}
m_AnchoredPosition: {x: 10.024994, y: 0}
m_SizeDelta: {x: -19.95, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7159022552736160154
@ -9691,8 +9770,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: 139, y: 33}
m_SizeDelta: {x: 50, y: 50}
m_AnchoredPosition: {x: 139, y: 36.1}
m_SizeDelta: {x: 80, y: 53}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4416805191077310780
CanvasRenderer:
@ -9722,7 +9801,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8d326910ed39c3e41814247689823ba8, type: 3}
m_Sprite: {fileID: 21300000, guid: b0e7fed510112a849854cf4ddad98122, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -12904,6 +12983,81 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6645945141241978042
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 124666416754824053}
- component: {fileID: 808032539837590336}
- component: {fileID: 121060328482058433}
m_Layer: 0
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &124666416754824053
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6645945141241978042}
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:
- {fileID: 7236035587429049075}
m_Father: {fileID: 2041658285895753670}
m_RootOrder: 1
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: -62.9, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &808032539837590336
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6645945141241978042}
m_CullTransparentMesh: 0
--- !u!114 &121060328482058433
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6645945141241978042}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
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: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &6661066025031286657
GameObject:
m_ObjectHideFlags: 0
@ -13997,6 +14151,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4924777543454380687}
- {fileID: 124666416754824053}
m_Father: {fileID: 5895856323007929039}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -15450,7 +15605,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10.025002, y: 0}
m_AnchoredPosition: {x: 10.024994, y: 0}
m_SizeDelta: {x: -19.95, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6606581156521228174
@ -15574,7 +15729,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u514D\u8D39\u6311\u6218"
m_Text:
--- !u!1 &7914932935000546386
GameObject:
m_ObjectHideFlags: 0

View File

@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 223004754372590400}
- component: {fileID: 114372824615027968}
m_Layer: 0
m_Name: ArenaRecordPopup
m_Name: WorldArenaRecordPopup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -345,7 +345,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: 194.01, y: -2.9}
m_AnchoredPosition: {x: 350.1, y: 43.2}
m_SizeDelta: {x: 130.79, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222929285231308004
@ -383,13 +383,13 @@ MonoBehaviour:
m_BestFit: 1
m_MinSize: 26
m_MaxSize: 34
m_Alignment: 5
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: +15
m_Text: "\u79EF\u5206+15"
--- !u!1 &1302819781731396
GameObject:
m_ObjectHideFlags: 0
@ -1087,7 +1087,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224170130709635840
RectTransform:
m_ObjectHideFlags: 0

View File

@ -1477,6 +1477,7 @@ FUNCTION_OPEN_TYPE = {
guajigongneng = 89,--挂机多人
FIGHTLEVEL = 107,--山河社稷图
PRACTICE = 108,--修行
JumpServer_YuXu = 111, -- 玉虚论道
}
@ -2470,7 +2471,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
[24] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 24},
[25] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 25},
[26] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 26},
[27] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.WORLDARENA,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 10},
[27] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.WORLDARENA,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 10},
}

View File

@ -91,6 +91,51 @@ TAKEARENABATTLEREWARDREQUEST = protobuf.Descriptor();
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
TAKEARENABATTLEREWARDRESPONSE = protobuf.Descriptor();
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFOREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOGETINFORESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGEREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETDAILYREWARDREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOBATTLERECORDREQUEST = protobuf.Descriptor();
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD = protobuf.FieldDescriptor();
CROSSYUXULUNDAOBATTLERECORDRESPONSE = protobuf.Descriptor();
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD = protobuf.FieldDescriptor();
GETARENAINFORESPONSE_ARENAINFO_FIELD.name = "arenaInfo"
GETARENAINFORESPONSE_ARENAINFO_FIELD.full_name = ".rpc.protocols.GetArenaInfoResponse.arenaInfo"
@ -907,6 +952,430 @@ TAKEARENABATTLEREWARDRESPONSE.enum_types = {}
TAKEARENABATTLEREWARDRESPONSE.fields = {TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD}
TAKEARENABATTLEREWARDRESPONSE.is_extendable = false
TAKEARENABATTLEREWARDRESPONSE.extensions = {}
CROSSYUXULUNDAOGETINFOREQUEST.name = "CrossYuXuLunDaoGetInfoRequest"
CROSSYUXULUNDAOGETINFOREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoRequest"
CROSSYUXULUNDAOGETINFOREQUEST.nested_types = {}
CROSSYUXULUNDAOGETINFOREQUEST.enum_types = {}
CROSSYUXULUNDAOGETINFOREQUEST.fields = {}
CROSSYUXULUNDAOGETINFOREQUEST.is_extendable = false
CROSSYUXULUNDAOGETINFOREQUEST.extensions = {}
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.name = "isFirst"
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.isFirst"
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.number = 1
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.index = 0
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.type = 8
CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD.cpp_type = 7
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.name = "arenaEnemys"
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.arenaEnemys"
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.number = 2
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.index = 1
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.label = 3
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.default_value = {}
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.message_type = CommonProto_pb.ARENAPERSONINFO
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.type = 11
CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD.cpp_type = 10
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.name = "oldMyscore"
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.oldMyscore"
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.number = 3
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.index = 2
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.name = "newMyscore"
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.newMyscore"
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.number = 4
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.index = 3
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.name = "oldLevelId"
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.oldLevelId"
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.number = 5
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.index = 4
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.name = "newLevelId"
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.newLevelId"
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.number = 6
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.index = 5
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.name = "myRank"
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.myRank"
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.number = 7
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.index = 6
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.name = "freeTimes"
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.freeTimes"
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.number = 8
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.index = 7
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.name = "drop"
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.drop"
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.number = 9
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.index = 8
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.default_value = nil
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.type = 11
CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD.cpp_type = 10
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.name = "dailyRewardState"
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.dailyRewardState"
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.number = 10
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.index = 9
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.label = 3
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.default_value = {}
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.name = "changedTimes"
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse.changedTimes"
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.number = 11
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.index = 10
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.label = 1
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.has_default_value = false
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.default_value = 0
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.type = 5
CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETINFORESPONSE.name = "CrossYuXuLunDaoGetInfoResponse"
CROSSYUXULUNDAOGETINFORESPONSE.full_name = ".rpc.protocols.CrossYuXuLunDaoGetInfoResponse"
CROSSYUXULUNDAOGETINFORESPONSE.nested_types = {}
CROSSYUXULUNDAOGETINFORESPONSE.enum_types = {}
CROSSYUXULUNDAOGETINFORESPONSE.fields = {CROSSYUXULUNDAOGETINFORESPONSE_ISFIRST_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_ARENAENEMYS_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_OLDMYSCORE_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_NEWMYSCORE_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_OLDLEVELID_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_NEWLEVELID_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_MYRANK_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_FREETIMES_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_DROP_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_DAILYREWARDSTATE_FIELD, CROSSYUXULUNDAOGETINFORESPONSE_CHANGEDTIMES_FIELD}
CROSSYUXULUNDAOGETINFORESPONSE.is_extendable = false
CROSSYUXULUNDAOGETINFORESPONSE.extensions = {}
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.name = "playerId"
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeBeforeRequest.playerId"
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.number = 1
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.index = 0
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.name = "defId"
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeBeforeRequest.defId"
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.number = 2
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.index = 1
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST.name = "CrossYuXuLunDaoChallengeBeforeRequest"
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeBeforeRequest"
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST.nested_types = {}
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST.enum_types = {}
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST.fields = {CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_PLAYERID_FIELD, CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST_DEFID_FIELD}
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST.is_extendable = false
CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST.extensions = {}
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.name = "myTeamInfo"
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeBeforeResponse.myTeamInfo"
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.number = 1
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.index = 0
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.default_value = nil
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.message_type = CommonProto_pb.TEAMONEINFO
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.type = 11
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD.cpp_type = 10
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.name = "defTeamInfo"
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeBeforeResponse.defTeamInfo"
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.number = 2
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.index = 1
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.default_value = nil
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.message_type = CommonProto_pb.TEAMONEINFO
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.type = 11
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD.cpp_type = 10
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE.name = "CrossYuXuLunDaoChallengeBeforeResponse"
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeBeforeResponse"
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE.nested_types = {}
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE.enum_types = {}
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE.fields = {CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_MYTEAMINFO_FIELD, CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE_DEFTEAMINFO_FIELD}
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE.is_extendable = false
CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE.extensions = {}
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.name = "teamId"
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeRequest.teamId"
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.number = 1
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.index = 0
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.label = 3
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.default_value = {}
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.name = "challengeUid"
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeRequest.challengeUid"
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.number = 2
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.index = 1
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.name = "challengeType"
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeRequest.challengeType"
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.number = 3
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.index = 2
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGEREQUEST.name = "CrossYuXuLunDaoChallengeRequest"
CROSSYUXULUNDAOCHALLENGEREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeRequest"
CROSSYUXULUNDAOCHALLENGEREQUEST.nested_types = {}
CROSSYUXULUNDAOCHALLENGEREQUEST.enum_types = {}
CROSSYUXULUNDAOCHALLENGEREQUEST.fields = {CROSSYUXULUNDAOCHALLENGEREQUEST_TEAMID_FIELD, CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGEUID_FIELD, CROSSYUXULUNDAOCHALLENGEREQUEST_CHALLENGETYPE_FIELD}
CROSSYUXULUNDAOCHALLENGEREQUEST.is_extendable = false
CROSSYUXULUNDAOCHALLENGEREQUEST.extensions = {}
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.name = "myScore"
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.myScore"
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.number = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.index = 0
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.name = "defScore"
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.defScore"
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.number = 2
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.index = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.name = "arenaEnemys"
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.arenaEnemys"
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.number = 3
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.index = 2
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.label = 3
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.default_value = {}
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.message_type = CommonProto_pb.ARENAPERSONINFO
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.type = 11
CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD.cpp_type = 10
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.name = "fightData"
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.fightData"
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.number = 4
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.index = 3
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.label = 3
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.default_value = {}
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.message_type = CommonProto_pb.FIGHTDATA
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.type = 11
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD.cpp_type = 10
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.name = "fightResult"
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.fightResult"
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.number = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.index = 4
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.label = 3
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.default_value = {}
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.name = "drop"
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.drop"
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.number = 6
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.index = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.default_value = nil
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.type = 11
CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD.cpp_type = 10
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.name = "myRank"
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.myRank"
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.number = 7
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.index = 6
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.name = "freeTimes"
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.freeTimes"
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.number = 8
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.index = 7
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.name = "changedTimes"
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse.changedTimes"
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.number = 9
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.index = 8
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.label = 1
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.has_default_value = false
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.default_value = 0
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.type = 5
CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD.cpp_type = 1
CROSSYUXULUNDAOCHALLENGERESPONSE.name = "CrossYuXuLunDaoChallengeResponse"
CROSSYUXULUNDAOCHALLENGERESPONSE.full_name = ".rpc.protocols.CrossYuXuLunDaoChallengeResponse"
CROSSYUXULUNDAOCHALLENGERESPONSE.nested_types = {}
CROSSYUXULUNDAOCHALLENGERESPONSE.enum_types = {}
CROSSYUXULUNDAOCHALLENGERESPONSE.fields = {CROSSYUXULUNDAOCHALLENGERESPONSE_MYSCORE_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_DEFSCORE_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_ARENAENEMYS_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTDATA_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_FIGHTRESULT_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_DROP_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_MYRANK_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_FREETIMES_FIELD, CROSSYUXULUNDAOCHALLENGERESPONSE_CHANGEDTIMES_FIELD}
CROSSYUXULUNDAOCHALLENGERESPONSE.is_extendable = false
CROSSYUXULUNDAOCHALLENGERESPONSE.extensions = {}
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST.name = "CrossYuXuLunDaoChangeEnemyInfoRequest"
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoChangeEnemyInfoRequest"
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST.nested_types = {}
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST.enum_types = {}
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST.fields = {}
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST.is_extendable = false
CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST.extensions = {}
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.name = "arenaEnemys"
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoChangeEnemyInfoResponse.arenaEnemys"
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.number = 1
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.index = 0
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.label = 3
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.has_default_value = false
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.default_value = {}
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.message_type = CommonProto_pb.ARENAPERSONINFO
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.type = 11
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD.cpp_type = 10
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE.name = "CrossYuXuLunDaoChangeEnemyInfoResponse"
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE.full_name = ".rpc.protocols.CrossYuXuLunDaoChangeEnemyInfoResponse"
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE.nested_types = {}
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE.enum_types = {}
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE.fields = {CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE_ARENAENEMYS_FIELD}
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE.is_extendable = false
CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE.extensions = {}
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.name = "type"
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetDailyRewardRequest.type"
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.number = 1
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.index = 0
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.label = 1
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.has_default_value = false
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.default_value = 0
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.type = 5
CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD.cpp_type = 1
CROSSYUXULUNDAOGETDAILYREWARDREQUEST.name = "CrossYuXuLunDaoGetDailyRewardRequest"
CROSSYUXULUNDAOGETDAILYREWARDREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoGetDailyRewardRequest"
CROSSYUXULUNDAOGETDAILYREWARDREQUEST.nested_types = {}
CROSSYUXULUNDAOGETDAILYREWARDREQUEST.enum_types = {}
CROSSYUXULUNDAOGETDAILYREWARDREQUEST.fields = {CROSSYUXULUNDAOGETDAILYREWARDREQUEST_TYPE_FIELD}
CROSSYUXULUNDAOGETDAILYREWARDREQUEST.is_extendable = false
CROSSYUXULUNDAOGETDAILYREWARDREQUEST.extensions = {}
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.name = "isSuccess"
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetDailyRewardResponse.isSuccess"
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.number = 1
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.index = 0
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.label = 1
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.has_default_value = false
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.default_value = false
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.type = 8
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD.cpp_type = 7
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.name = "drop"
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoGetDailyRewardResponse.drop"
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.number = 2
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.index = 1
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.label = 1
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.has_default_value = false
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.default_value = nil
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.type = 11
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD.cpp_type = 10
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE.name = "CrossYuXuLunDaoGetDailyRewardResponse"
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE.full_name = ".rpc.protocols.CrossYuXuLunDaoGetDailyRewardResponse"
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE.nested_types = {}
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE.enum_types = {}
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE.fields = {CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_ISSUCCESS_FIELD, CROSSYUXULUNDAOGETDAILYREWARDRESPONSE_DROP_FIELD}
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE.is_extendable = false
CROSSYUXULUNDAOGETDAILYREWARDRESPONSE.extensions = {}
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.name = "uid"
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleRecordRequest.uid"
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.number = 1
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.index = 0
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.label = 1
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.has_default_value = false
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.default_value = 0
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.type = 5
CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD.cpp_type = 1
CROSSYUXULUNDAOBATTLERECORDREQUEST.name = "CrossYuXuLunDaoBattleRecordRequest"
CROSSYUXULUNDAOBATTLERECORDREQUEST.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleRecordRequest"
CROSSYUXULUNDAOBATTLERECORDREQUEST.nested_types = {}
CROSSYUXULUNDAOBATTLERECORDREQUEST.enum_types = {}
CROSSYUXULUNDAOBATTLERECORDREQUEST.fields = {CROSSYUXULUNDAOBATTLERECORDREQUEST_UID_FIELD}
CROSSYUXULUNDAOBATTLERECORDREQUEST.is_extendable = false
CROSSYUXULUNDAOBATTLERECORDREQUEST.extensions = {}
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.name = "recordData"
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleRecordResponse.recordData"
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.number = 1
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.index = 0
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.label = 3
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.has_default_value = false
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.default_value = {}
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.message_type = CommonProto_pb.CROSSYXLDPLAYERRECORDINFO
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.type = 11
CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD.cpp_type = 10
CROSSYUXULUNDAOBATTLERECORDRESPONSE.name = "CrossYuXuLunDaoBattleRecordResponse"
CROSSYUXULUNDAOBATTLERECORDRESPONSE.full_name = ".rpc.protocols.CrossYuXuLunDaoBattleRecordResponse"
CROSSYUXULUNDAOBATTLERECORDRESPONSE.nested_types = {}
CROSSYUXULUNDAOBATTLERECORDRESPONSE.enum_types = {}
CROSSYUXULUNDAOBATTLERECORDRESPONSE.fields = {CROSSYUXULUNDAOBATTLERECORDRESPONSE_RECORDDATA_FIELD}
CROSSYUXULUNDAOBATTLERECORDRESPONSE.is_extendable = false
CROSSYUXULUNDAOBATTLERECORDRESPONSE.extensions = {}
ArenaChallengeRequest = protobuf.Message(ARENACHALLENGEREQUEST)
ArenaChallengeResponse = protobuf.Message(ARENACHALLENGERESPONSE)
@ -926,6 +1395,18 @@ ChampionTwoEnemInfo = protobuf.Message(CHAMPIONTWOENEMINFO)
ChampionViewFinalRequest = protobuf.Message(CHAMPIONVIEWFINALREQUEST)
ChampionViewFinalResponse = protobuf.Message(CHAMPIONVIEWFINALRESPONSE)
ChanpionGetAllMyBattleHistoryResponse = protobuf.Message(CHANPIONGETALLMYBATTLEHISTORYRESPONSE)
CrossYuXuLunDaoBattleRecordRequest = protobuf.Message(CROSSYUXULUNDAOBATTLERECORDREQUEST)
CrossYuXuLunDaoBattleRecordResponse = protobuf.Message(CROSSYUXULUNDAOBATTLERECORDRESPONSE)
CrossYuXuLunDaoChallengeBeforeRequest = protobuf.Message(CROSSYUXULUNDAOCHALLENGEBEFOREREQUEST)
CrossYuXuLunDaoChallengeBeforeResponse = protobuf.Message(CROSSYUXULUNDAOCHALLENGEBEFORERESPONSE)
CrossYuXuLunDaoChallengeRequest = protobuf.Message(CROSSYUXULUNDAOCHALLENGEREQUEST)
CrossYuXuLunDaoChallengeResponse = protobuf.Message(CROSSYUXULUNDAOCHALLENGERESPONSE)
CrossYuXuLunDaoChangeEnemyInfoRequest = protobuf.Message(CROSSYUXULUNDAOCHANGEENEMYINFOREQUEST)
CrossYuXuLunDaoChangeEnemyInfoResponse = protobuf.Message(CROSSYUXULUNDAOCHANGEENEMYINFORESPONSE)
CrossYuXuLunDaoGetDailyRewardRequest = protobuf.Message(CROSSYUXULUNDAOGETDAILYREWARDREQUEST)
CrossYuXuLunDaoGetDailyRewardResponse = protobuf.Message(CROSSYUXULUNDAOGETDAILYREWARDRESPONSE)
CrossYuXuLunDaoGetInfoRequest = protobuf.Message(CROSSYUXULUNDAOGETINFOREQUEST)
CrossYuXuLunDaoGetInfoResponse = protobuf.Message(CROSSYUXULUNDAOGETINFORESPONSE)
GetArenaInfoResponse = protobuf.Message(GETARENAINFORESPONSE)
GetArenaRankInfoRequest = protobuf.Message(GETARENARANKINFOREQUEST)
GetArenaRankInfoResponse = protobuf.Message(GETARENARANKINFORESPONSE)

View File

@ -287,6 +287,9 @@ function this:OnDestroy()
end
local yxAllHeros=nil
function this.SetCurFormationIndex(_index)
this.curFormationIndex=_index
end
--刷新编队
function this.RefreshFormation(isTop,isAni)
proId=0
@ -569,6 +572,7 @@ function this.OnClickTabBtn(_proId, isTop,isAni)
end
end
this.empty:SetActive(#heros<=0)
this.SetRoleList(heros, isTop,isAni)
end
@ -576,6 +580,9 @@ end
--设置英雄列表数据
function this.SetRoleList(_roleDatas, isTop,isAni)
if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then
this.opView.RemoveTeamByIndex(this.curFormationIndex)
end
this.SortHeroDatas(_roleDatas)
-- local curFormation = FormationManager.formationList[this.curFormationIndex]
this.scrollView:SetData(_roleDatas, function(index, go)
@ -751,6 +758,10 @@ function this.SingleHeroDataShow(_go, _heroData)
for i,v in pairs(this.choosedList) do
if(heroData.dynamicId==v.heroId) then
choosedObj:SetActive(true)
--如果是玉虚论道
if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then
this.opView.AddHeroToTeam(heroData.dynamicId,v.position,this.curFormationIndex)
end
end
end
local index
@ -811,7 +822,6 @@ function this.SingleHeroDataShow(_go, _heroData)
end
end
-- 判断是否有血量
-- if heroHp and heroHp <= 0 then PopupTipPanel.ShowTip("猎妖师重伤,不可上阵!") return end
choosedObj:SetActive(true)
@ -823,15 +833,24 @@ function this.SingleHeroDataShow(_go, _heroData)
return
end
--如果在玉虚三个队里面的另外一个队
local curPos=this.GetPos()
if yxID~=0 and yxID~=this.curFormationIndex then
MsgPanel.ShowTwo("该神将正处于其他队伍,是否要编入当前队伍内",nil, function()
--改变英雄队伍id改变
this.opView.ChangeHeroTeam(heroData.dynamicId,this.curFormationIndex,this.GetPos())
this.opView.ChangeHeroTeam(heroData.dynamicId,this.curFormationIndex,curPos)
yxID=this.curFormationIndex
yxInfo:SetActive(false)
table.insert(this.choosedList, {heroId = heroData.dynamicId, position=curPos})
this.SetCardsData(this.choosedList)
end)
return
end
table.insert(this.choosedList, {heroId = heroData.dynamicId, position=curPos})
--如果是玉虚论道
if this.curFormationIndex==2001 or this.curFormationIndex==2002 or this.curFormationIndex==2003 then
this.opView.AddHeroToTeam(heroData.dynamicId,curPos,this.curFormationIndex)
end
table.insert(this.choosedList, {heroId = heroData.dynamicId, position=this.GetPos()})
this.SetCardsData(this.choosedList)
else
PopupTipPanel.ShowTip(Language[10691])
@ -1060,11 +1079,11 @@ function this.SetOneKeyGo()
for k, v in ipairs(heros) do
local curSingleherodata = HeroManager.GetSingleHeroData(v.dynamicId)
if not upHeroSidTable[curSingleherodata.id] then
--LogGreen("this.choosedList "..#this.choosedList)
if #this.choosedList < 6 then
for n = 1, #posArr do
upHeroSidTable[curSingleherodata.id] = curSingleherodata.id
table.insert(this.choosedList, {heroId = v.dynamicId, position=posArr[n]})
this.opView.AddHeroToTeam(v.dynamicId,posArr[n],this.curFormationIndex)
table.remove(posArr,n)
this.order = this.order + 1
break
@ -1244,7 +1263,10 @@ function this.SetOneKeyGoYuXunLunDao()
return
end
local theros = HeroManager.GetAllHeroDatas(limitLevel)
theros = ExpeditionManager.GetAllHeroDatas(theros,limitLevel)
--theros = ExpeditionManager.GetAllHeroDatas(theros,limitLevel)
--获取其他队伍上阵的英雄id
local ids=this.opView.GetOtherTeamAllHeroIds(this.curFormationIndex)
--按战力从大到小排序
table.sort(theros,function(a,b)
if a.warPower == b.warPower then
@ -1262,17 +1284,20 @@ function this.SetOneKeyGoYuXunLunDao()
upHeroSidTable[curSingleherodata.id] = curSingleherodata.id
end
for k, v in ipairs(theros) do
local curSingleherodata = HeroManager.GetSingleHeroData(v.dynamicId)
local hp = FormationManager.GetFormationHeroHp(this.curFormationIndex,v.dynamicId)
if not upHeroSidTable[curSingleherodata.id] and hp > 0 then
--LogGreen("this.choosedList "..#this.choosedList)
if #this.choosedList < 6 then
for n = 1, #posArr do
upHeroSidTable[curSingleherodata.id] = curSingleherodata.id
table.insert(this.choosedList, {heroId = v.dynamicId, position=posArr[n]})
table.remove(posArr,n)
this.order = this.order + 1
break
local isCon=BattleUtil.ChecklistIsContainValue(ids,v.dynamicId)
if not isCon then
local curSingleherodata = HeroManager.GetSingleHeroData(v.dynamicId)
local hp = FormationManager.GetFormationHeroHp(this.curFormationIndex,v.dynamicId)
if not upHeroSidTable[curSingleherodata.id] and hp > 0 then
--LogGreen("this.choosedList "..#this.choosedList)
if #this.choosedList < 6 then
for n = 1, #posArr do
upHeroSidTable[curSingleherodata.id] = curSingleherodata.id
table.insert(this.choosedList, {heroId = v.dynamicId, position=posArr[n]})
table.remove(posArr,n)
this.order = this.order + 1
break
end
end
end
end

View File

@ -12,7 +12,9 @@ local checkFunc = function ()
this.lightList[j]:SetActive(false)
end
this.lightList[this.curIndex]:SetActive(true)
this.root.RefreshHeroList()
LogError("curindex=="..this.curIndex)
this.root.SetCurFormationIndex(this.curIndex+2000)
this.root.RefreshFormation(true,true)
end
local switchFunc = function (type)
@ -115,6 +117,21 @@ function this.GetFormationIndex()
return 2000 + this.curIndex
end
--移除缓存数据
function this.RemoveTeamByIndex(_index)
if currAllTeams[_index] then
currAllTeams[_index]={}
end
for key, value in pairs(allHeros) do
if value.index==_index then
table.removebyvalue(allHeros,value)
end
end
end
function this.ChangeHeroTeam(id,_index,_pos)
local hero=nil
--旧队伍里移除
@ -122,18 +139,44 @@ function this.ChangeHeroTeam(id,_index,_pos)
for i = 1, #value.teamHeroInfos do
if value.teamHeroInfos[i].heroId==id then
hero=value.teamHeroInfos[i]
table.remove(value.teamHeroInfos[i])
LogError("从旧队伍里面移除 "..value.teamId)
table.removebyvalue(value.teamHeroInfos,value.teamHeroInfos[i])
break
end
end
end
hero.position=_pos
table.insert(currAllTeams,hero)
table.insert(currAllTeams[_index].teamHeroInfos,hero)
allHeros[id].pos=_pos
allHeros[id].index=_index
LogError("添加到新队伍 ".._index)
end
--添加到队伍
function this.AddHeroToTeam(id,pos,index)
if currAllTeams[index] then
if not currAllTeams[index].teamHeroInfos then
currAllTeams[index].teamHeroInfos={}
end
--便利所有的看是否存在
for i = 1, #currAllTeams[index].teamHeroInfos do
if currAllTeams[index].teamHeroInfos[i].heroId ==id then
currAllTeams[index].teamHeroInfos[i].position=pos
end
end
table.insert(currAllTeams[index].teamHeroInfos,{heroId=id,position=pos})
if not allHeros[id] then
LogError(" 新添加英雄=="..id)
allHeros[id]={Id=id,pos=pos,index=index}
else
allHeros[id].Id=id
allHeros[id].pos=pos
allHeros[id].index=index
end
else
LogError("没有该阵容=="..index)
end
end
function this.GetTeamInfoByIndex(index)
if currAllTeams[index] then
@ -151,10 +194,16 @@ end
--改变编队id
function this.ChangeTeamIndex(type)
local one=currAllTeams[type+2000]
local two=currAllTeams[type+1+2000]
currAllTeams[type+2000]=two
currAllTeams[type+2000+1]=one
local one=currAllTeams[type+2000].teamHeroInfos
local two=currAllTeams[type+1+2000].teamHeroInfos
if one==nil then
one={}
end
if two==nil then
two={}
end
currAllTeams[type+2000].teamHeroInfos=two
currAllTeams[type+2000+1].teamHeroInfos=one
for key, value in pairs(allHeros) do
if value.index==type then
value.index=type+1
@ -178,11 +227,50 @@ end
function this.On_Btn1_Click()
this.root.SetOneKeyGoYuXunLunDao()
end
--获取其他两队所有的英雄id
function this.GetOtherTeamAllHeroIds(_index)
local ids={}
for key, value in pairs(allHeros) do
if value.index~=_index then
table.insert(ids,key)
end
end
return ids
end
function this.On_Btn2_Click()
local oneTeam={}
local twoTeam={}
local threeTeam={}
local allTeam={}
if this.root.order>=1 then
LogError("保存阵容success")
FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList,
FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos)
--检测三个队伍是否有重复英雄
LogError(LengthOfTable(allHeros))
for key, value in pairs(allHeros) do
local newHero={}
newHero.heroId=value.Id
newHero.position=value.pos
LogError(" id=="..value.Id.." posi=="..value.pos)
if value.index==2001 then
table.insert(oneTeam,newHero)
elseif value.index==2002 then
table.insert(twoTeam,newHero)
elseif value.index==2003 then
table.insert(threeTeam,newHero)
end
end
table.insert(allTeam,oneTeam)
table.insert(allTeam,twoTeam)
table.insert(allTeam,threeTeam)
for i = 1, 3 do
FormationManager.RefreshFormation(i+2000, allTeam[i],
FormationManager.formationList[2001].teamPokemonInfos)
end
PopupTipPanel.ShowTip(Language[10713])
this.root:ClosePanel()
else

View File

@ -288,7 +288,7 @@ end
-- 刷新编队信息
function this.RefreshFormationShow()
if this._ViewType == GUILD_MEM_POPUP_TYPE.INFORMATION then
NetManager.RequestPlayerInfo(this._MemId, FormationTypeDef.FORMATION_NORMAL, nil,function(msg)
NetManager.RequestPlayerInfo(this._MemId, FormationTypeDef.FORMATION_NORMAL, nil,0,function(msg)
-- 重置战斗力
local teamInfo = msg.teamInfo.team
local force = teamInfo.totalForce

View File

@ -2784,11 +2784,12 @@ function this.RequestSignIn(dayIndex, func)
end
-- 获取玩家信息
function this.RequestPlayerInfo(uid, teamId,serverName, func)
function this.RequestPlayerInfo(uid, teamId,serverName,teamType, func)
local data = PlayerInfoProto_pb.GetPlayerOneTeamInfoRequest()
data.playerId = uid
data.teamId = teamId
data.serverId = serverName and 1 or 0
data.teamType =teamType
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.GET_PLAYER_ONE_TEAM_INFO_REQUEST, MessageTypeProto_pb.GET_PLAYER_ONE_TEAM_INFO_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
@ -5516,9 +5517,9 @@ end
function NetManager.CrossYuXuLunDaoGetDailyRewardRequest(func)
local data=ArenaInfoProto_pb.CrossYuXuLunDaoGetDailyRewardRequest()
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoChangeEnemyInfoRequest, MessageTypeProto_pb.CrossYuXuLunDaoChangeEnemyInfoResponse, msg, function(buffer)
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoGetDailyRewardRequest, MessageTypeProto_pb.CrossYuXuLunDaoGetDailyRewardResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoChangeEnemyInfoResponse()
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoGetDailyRewardResponse()
msg:ParseFromString(data)
if func then
func(msg)
@ -5570,5 +5571,93 @@ function NetManager.SevenWorldRelicRequest(_tierId,func)
end
end)
end
--请求玉虚论道编队信息
-- 获取玩家信息
function this.GetPlayerCrossYxldOneTeamInfoRequest(uid, _serverId,func)
local data = PlayerInfoProto_pb.GetPlayerCrossYxldOneTeamInfoRequest()
data.playerId = uid
data.serverId = _serverId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.GetPlayerCrossYxldOneTeamInfoRequest, MessageTypeProto_pb.GetPlayerCrossYxldOneTeamInfoResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.GetPlayerCrossYxldOneTeamInfoResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
-- --玉虚论道挑战
-- function this.CrossYuXuLunDaoChallengeRequest(uid,teamIds,type,func)
-- local data = ArenaInfoProto_pb.CrossYuXuLunDaoChallengeRequest()
-- data.teamId=teamIds
-- data.challengeUid=uid
-- data.challengeType=type
-- local msg = data:SerializeToString()
-- Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoChallengeRequest, MessageTypeProto_pb.CrossYuXuLunDaoChallengeResponse, msg, function(buffer)
-- local data = buffer:DataByte()
-- local msg = ArenaInfoProto_pb.CrossYuXuLunDaoChallengeResponse()
-- msg:ParseFromString(data)
-- if func then
-- func(msg)
-- end
-- end)
-- end
--玉虚论道战斗前界面协议
function this.CrossYuXuLunDaoChallengeBeforeRequest(myId,enId,func)
local data = ArenaInfoProto_pb.CrossYuXuLunDaoChallengeBeforeRequest()
data.playerId=myId
data.defId=enId
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoChallengeBeforeRequest, MessageTypeProto_pb.CrossYuXuLunDaoChallengeBeforeResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoChallengeBeforeResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
--玉虚论道战斗协议
function this.CrossYuXuLunDaoChallengeRequest(list,id,type,func)
local data = ArenaInfoProto_pb.CrossYuXuLunDaoChallengeRequest()
if list then
for i = 1, #list do
table.insert(data.teamId,list[i])
end
end
--data.teamId=list
data.challengeUid=id
data.challengeType=type
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoChallengeRequest, MessageTypeProto_pb.CrossYuXuLunDaoChallengeResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoChallengeResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
--玉虚论道请求回放记录
function this.CrossYuXuLunDaoBattleRecordRequest(id,func)
local data = ArenaInfoProto_pb.CrossYuXuLunDaoBattleRecordRequest()
data.uid=id
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossYuXuLunDaoBattleRecordRequest, MessageTypeProto_pb.CrossYuXuLunDaoBattleRecordResponse, msg, function(buffer)
local data = buffer:DataByte()
local msg = ArenaInfoProto_pb.CrossYuXuLunDaoBattleRecordResponse()
msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
return this

View File

@ -207,7 +207,7 @@ function PlayerInfoPopup:OnShow()
if this.serverName and this.serverName ~= "" then--and this.serverName ~= PlayerManager.serverInfo.name
netserverName = 1
end
NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType,netserverName, function(msg)
NetManager.RequestPlayerInfo(this._PlayerId, this._Config.formationType,netserverName,0, function(msg)
-- 如果是好友更新好友数据
curPlayerName = msg.teamInfo.name
GoodFriendManager.UpdateFriendData(this._PlayerId, msg.teamInfo.level, JingJiShouWeiToEn(msg.teamInfo.name) , msg.teamInfo.head, msg.teamInfo.headFrame)

View File

@ -87,15 +87,18 @@ function this.SwitchView(index)
proud = RankingManager.GetRankProud()
--先执行上一面板关闭逻辑
local currankKingList = {}
local _GoIndex = #rankKingListGo + 1
for i = 1, math.max(#rankKingListGo, #rankKingList) do
if curIndex == rankKingList[i].isRankingMainPanelShow then
local go = rankKingListGo[i]
local go = rankKingListGo[_GoIndex]
if not go then
go=newObject(this.ItemPre)
go.transform:SetParent(this.grid.transform)
go.transform.localScale = Vector3.one
go.transform.localPosition=Vector3.zero;
rankKingListGo[i] = go
--LogPink("i "..i)
rankKingListGo[_GoIndex] = go
_GoIndex = _GoIndex + 1
end
go.gameObject:SetActive(false)
table.insert(currankKingList, rankKingList[i])
@ -105,7 +108,7 @@ function this.SwitchView(index)
if curIndex == rankKingList[i].isRankingMainPanelShow then
for j = 1, #currankKingList do
if currankKingList[j].rankType == rankKingList[i].rankType then
LogYellow("j "..j)
--LogYellow("j "..j)
rankKingListGo[j]:SetActive(true)
this.SingleRankKingListShow(j,i)
end

View File

@ -292,17 +292,17 @@ function this.SetHeadsInfo(data,root,index,name,level)
npc:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT)
Util.AddOnceClick(this.firstheadClick,function()
-- if sData.rankType == RANK_TYPE.TASUILINGXIAO then
-- UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.TSLX)
-- elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then
-- UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.serverName and data.serverName or nil)
-- elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
-- UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil)
-- else
-- UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)
-- end
LogGreen("data.uid:"..tostring(data.uid))
UIManager.OpenPanel(UIName.WorldArenaMyTeamPanel, data.uid)
if sData.rankType == RANK_TYPE.TASUILINGXIAO then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.TSLX)
elseif sData.rankType == RANK_TYPE.JUMPSERVER_HIGHTLADDER then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,data.serverName and data.serverName or nil)
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,data.serverName and data.serverName or nil)
elseif sData.rankType == RANK_TYPE.WORLDARENA then
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, data.uid,2)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)
end
end)
end
@ -339,6 +339,8 @@ function this.AddPlayerInfoClick(root,uid,serverName)
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER,serverName and serverName or nil)
elseif sData.rankType == RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR or sData.rankType == RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK or sData.rankType == RANK_TYPE.JUMPSERVER_MONSTER_RANK then
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid,PLAYER_INFO_VIEW_TYPE.JUPMSERVER_NORMAL,serverName and serverName or nil)
elseif sData.rankType == RANK_TYPE.WORLDARENA then
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, uid,2)
else
UIManager.OpenPanel(UIName.PlayerInfoPopup, uid)
end

View File

@ -2,14 +2,34 @@ require("Base/BasePanel")
local WorldArenaBattleInfoPanel = Inherit(BasePanel)
local this = WorldArenaBattleInfoPanel
local state=1 -- 1:开战前 2.:开战中 3开战后
local state=1 -- 1:开战前 2.:开战中 3开战后
local myHeadObj=nil
local enHeadObj=nil
local resultList={}
local fightDataList={}
local type=0
local enemyId=0
local myInfoData=nil
local enInfoData=nil
local targetIndex=0
local currIndex=0
local isAnim = false
local _CloseFunc = nil
local function OnBeginDrag(self, Pointgo, data)
if state~=1 then
return
end
local num=999
for i = 1, 3 do
local dis = math.abs(Pointgo.transform.parent.parent.localPosition.y - this.leftTeam[i].transform.localPosition.y )
if dis <= num then
num = dis
currIndex=i
end
end
self.oldGrid = Pointgo.transform.parent.parent
self.tempInfo.transform.localPosition = Pointgo.transform.parent.parent.localPosition
Pointgo.transform.parent:SetParent(self.tempInfo.transform)
@ -20,7 +40,7 @@ local function OnDrag(self, Pointgo, data)
return
end
local pos = self.tempInfo.transform.localPosition
local y = pos.y + data.delta.y >= -300 and pos.y + data.delta.y or -300
local y = pos.y + data.delta.y >= -400 and pos.y + data.delta.y or -400
y = y <= 450 and y or 450
self.tempInfo.transform.localPosition = Vector2.New(pos.x , y)
end
@ -31,17 +51,19 @@ local function OnEndDrag(self, Pointgo, data)
--Pointgo.transform.parent.localPosition = Vector3.zero
local num = 999
local obj = nil
for i = 1, 3 do
local dis = math.abs( self.tempInfo.transform.localPosition.y - this.leftTeam[i].transform.localPosition.y )
LogError(" temp y=="..self.tempInfo.transform.localPosition.y.." leftteam y=="..this.leftTeam[i].transform.localPosition.y)
--LogError(" temp y=="..self.tempInfo.transform.localPosition.y.." leftteam y=="..this.leftTeam[i].transform.localPosition.y)
if dis <= num then
num = dis
obj = this.leftTeam[i]
LogError(" num=="..num)
targetIndex=i
end
end
--如果滑动距离太短,阵容放回原来的地方
if num<60 then
LogError(" num=="..num)
if num>100 then
LogError("**********")
local target=Util.GetGameObject(self.tempInfo.transform, "Demons")
target.transform:SetParent(self.oldGrid.transform)
@ -50,13 +72,16 @@ local function OnEndDrag(self, Pointgo, data)
return
end
if obj.transform.childCount > 0 then
--local targetInfo = obj.transform:GetChild(0)
local targetInfo=Util.GetGameObject(obj.transform, "Demons")
-- LogError("targetInfo name=="..targetInfo.name)
targetInfo.transform:SetParent(self.oldGrid.transform)
targetInfo.transform:SetSiblingIndex(1)
--targetInfo.localPosition = Vector3.zero
targetInfo.transform.localPosition=Vector3.New(0,-67,0)
if targetInfo then
targetInfo.transform:SetParent(self.oldGrid.transform)
targetInfo.transform:SetSiblingIndex(1)
targetInfo.transform.localPosition=Vector3.New(0,-67,0)
else
LogError("targetInfo==nil")
return
end
else
obj = self.oldGrid
end
@ -65,14 +90,13 @@ local function OnEndDrag(self, Pointgo, data)
curInfo:SetParent(obj.transform)
curInfo.transform:SetSiblingIndex(1)
curInfo.localPosition = Vector3.New(0,-67,0)
for i = 1, 3 do
self.InfoList[i] = Util.GetGameObject(self.Content, "Grid ("..i..")/Info")
-- WorldArenaMyTeamPanel:Refresh()
end
LogError("起始id=="..currIndex.." 终点id=="..targetIndex)
end
--初始化组件(用于子类重写)
function WorldArenaBattleInfoPanel:InitComponent()
this.spLoader = SpriteLoader.New()
this.btn_close=Util.GetGameObject(self.transform, "BG/BackBtn")
this.btn_fight=Util.GetGameObject(self.transform, "BG/btn_fight")
@ -80,12 +104,15 @@ function WorldArenaBattleInfoPanel:InitComponent()
this.rightName=Util.GetGameObject(self.transform, "BG/rightInfo/name"):GetComponent("Text")
this.myServer=Util.GetGameObject(self.transform, "BG/info/profess"):GetComponent("Text")
this.rightServer=Util.GetGameObject(self.transform, "BG/rightInfo/profess"):GetComponent("Text")
this.myHeadPar=Util.GetGameObject(self.transform, "BG/info/titlePar")
this.rightHeadPar=Util.GetGameObject(self.transform, "BG/rightInfo/titlePar")
this.myHeadPar=Util.GetGameObject(self.transform, "BG/info/head")
this.enHeadPar=Util.GetGameObject(self.transform, "BG/rightInfo/head")
this.myRankImg=Util.GetGameObject(self.transform, "BG/info/Image"):GetComponent("Image")
this.enRankImg=Util.GetGameObject(self.transform, "BG/rightInfo/Image"):GetComponent("Image")
this.myScore=Util.GetGameObject(self.transform, "BG/info/Text"):GetComponent("Text")
this.enScore=Util.GetGameObject(self.transform, "BG/rightInfo/Text"):GetComponent("Text")
this.titleTxt=Util.GetGameObject(self.transform, "BG/title"):GetComponent("Text")
this.myTeamInfo=Util.GetGameObject(self.transform, "BG/myInfo")
this.enTeamInfo=Util.GetGameObject(self.transform, "BG/enInfo")
--我方阵营
this.leftTeam={}
--第一局胜利图标
@ -121,10 +148,9 @@ function WorldArenaBattleInfoPanel:InitComponent()
for i = 1, 3 do
table.insert(this.playBacks,Util.GetGameObject(self.transform, "BG/playBacks/Image"..i))
end
this.btnText = Util.GetGameObject(self.transform, "BG/btn_fight/Text"):GetComponent("Text")
this.btnItem = Util.GetGameObject(self.transform, "BG/btn_fight/Image"):GetComponent("Image")
this.btnItemNum = Util.GetGameObject(self.transform, "BG/btn_fight/numText"):GetComponent("Text")
this.btnItemNum = Util.GetGameObject(self.transform, "BG/btn_fight/Image/numText"):GetComponent("Text")
this.RefreshBattleCastInfo()
end
@ -137,6 +163,7 @@ end
--刷新战斗消耗信息
function this.RefreshBattleCastInfo()
local leftTimes = WorldArenaManager.GetArenaChallengeTimes()
LogError("lefttime=="..leftTimes)
this.btnText.gameObject:SetActive(leftTimes > 0)
this.btnItem.gameObject:SetActive(leftTimes<=0)
this.btnItemNum.gameObject:SetActive(leftTimes<=0)
@ -149,19 +176,141 @@ function this.RefreshBattleCastInfo()
end
end
function WorldArenaBattleInfoPanel:PlayFightAnim(leftList, rightList, num, func)
coroutine.start(function()
for i = 1, num do
leftList[i].transform:DOLocalMoveX(90, 0.2, false):OnComplete(function()
leftList[i].transform:DOLocalMoveX(10, 0.3, false):OnComplete(function()
if func then
func(i)
end
end)
end)
rightList[i].transform:DOLocalMoveX(-80, 0.2, false):OnComplete(function()
rightList[i].transform:DOLocalMoveX(10, 0.3, false)
end)
coroutine.wait(0.2)
end
end)
end
--绑定事件(用于子类重写)
function WorldArenaBattleInfoPanel:BindEvent()
Util.AddClick(this.btn_close, function()
self:ClosePanel()
if state==2 then
return
end
if not isAnim then
self:ClosePanel()
end
end)
Util.AddClick(this.btn_fight, function()
-- 动画中不能再执行
if isAnim then
return
end
if type~=1 then
self:ClosePanel()
return
end
local list={2001,2002,2003}
NetManager.CrossYuXuLunDaoChallengeRequest(list,enemyId,1,function(msg)
LogError("战斗结束")
resultList=msg.fightResult
fightDataList=msg.fightData
LogError("myscore=="..msg.myScore.."defScore=="..msg.defScore)
isAnim = true
self:PlayFightAnim(this.leftTeam, this.rightTeam, 3, function(index)
this.ShowBattleState(index,3)
this.playBacks[index]:SetActive(true)
if index >= 3 then
isAnim = false
state = 3
type = 2
this.btnText.text="确定"
end
end)
--添加奖励 --
if msg.drop then
WorldArenaManager.AddReward(msg.drop)
end
-- for i = 1, #this.playBacks do
-- this.playBacks[i]:SetActive(true)
-- end
--播放打的动画
-- if this.TimeCounter then
-- this.TimeCounter=nil
-- end
-- local currIndex=1
-- local _TimeUpdate=function()
-- this.rightTeam[currIndex]:GetComponent("RectTransform").anchoredPosition=Vector3.New(101,this.rightTeam[currIndex]:GetComponent("RectTransform").anchoredPosition.y,0)
-- this.leftTeam[currIndex]:GetComponent("RectTransform").anchoredPosition=Vector3.New(278,this.leftTeam[currIndex]:GetComponent("RectTransform").anchoredPosition.y,0)
-- LogError("left pos.x=="..this.leftTeam[currIndex].transform.localPosition.x)
-- LogError("right pos.x=="..this.rightTeam[currIndex].transform.localPosition.x)
-- this.playBacks[currIndex]:SetActive(true)
-- this.ShowBattleState(currIndex,3)
-- this.leftTeam[currIndex]:GetComponent("RectTransform").anchoredPosition=Vector3.New(192,this.leftTeam[currIndex]:GetComponent("RectTransform").anchoredPosition.y,0)
-- this.rightTeam[currIndex]:GetComponent("RectTransform").anchoredPosition=Vector3.New(192,this.rightTeam[currIndex]:GetComponent("RectTransform").anchoredPosition.y,0)
-- LogError("left pos.x=="..this.leftTeam[currIndex].transform.localPosition.x)
-- LogError("right pos.x=="..this.rightTeam[currIndex].transform.localPosition.x)
-- LogError("--------------")
-- state=2
-- currIndex=currIndex+1
-- if this.TimeCounter and currIndex>3 then
-- this.TimeCounter:Stop()
-- this.TimeCounter = nil
-- state=3
-- end
-- end
-- this.TimeCounter = Timer.New(_TimeUpdate,1.5, -1, true)
-- this.TimeCounter:Start()
end)
end)
Util.AddClick(this.btn_fight, function()
LogError("111111111")
--PlayUIAnim(this.leftTeam[1].gameObject)
--PlayUIAnim(this.rightTeam[1].gameObject)
end)
--回放按钮点击事件
for i = 1, #this.playBacks do
Util.AddClick(this.playBacks[i],function()
local nameStr = myInfoData.name.."|"..enInfoData.name
local realResult = resultList[i] --(resultList[i] + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果
this.RequestReplayRecord(realResult,fightDataList[i], nameStr,function()
this:ClosePanel()
--构建显示结果数据(我永远在蓝方)
local arg = {}
arg.result = realResult
arg.blue = {}
arg.blue.uid = myInfoData.uid
arg.blue.name = myInfoData.name
arg.blue.head = myInfoData.head
arg.blue.frame = myInfoData.headFrame
arg.blue.deltaScore = myInfoData.myScoreChange
arg.red= {}
arg.red.uid = enInfoData.uid
arg.red.name = enInfoData.name
arg.red.head = enInfoData.head
arg.red.frame = enInfoData.headFrame
arg.red.deltaScore = enInfoData.myScoreChange
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
end)
end)
end
end
function this.RequestReplayRecord(isWin, fightData, nameStr, doneFunc,battle_type)
local fightData = BattleManager.GetBattleServerData({fightData = fightData}, 1)
local battlePanel = UIManager.OpenPanel(UIName.BattlePanel, fightData, battle_type and battle_type or BATTLE_TYPE.BACK, doneFunc)
battlePanel:ShowNameShow(isWin, nameStr)
end
--添加事件监听(用于子类重写)
function WorldArenaBattleInfoPanel:AddListener()
-- Game.GlobalEvent:AddEvent(GameEvent.Arena.OnRecordDataChange, this.RefreshRecordList)
@ -173,48 +322,78 @@ function WorldArenaBattleInfoPanel:RemoveListener()
end
--界面打开时调用(用于子类重写)
function WorldArenaBattleInfoPanel:OnOpen(...)
function WorldArenaBattleInfoPanel:OnOpen(msg,_type,closeFunc,list)
-- 请求数据
ArenaManager.RequestArenaRecord()
-- ArenaManager.RequestArenaRecord()
type=_type
_CloseFunc = closeFunc
-- 刷新显示
-- this.RefreshRecordList()
if state==1 then
for i = 1, #this.playbacks do
for i = 1, 3 do
this.playBacks[i]:SetActive(false)
this.ShowBattleState(i, state)
end
end
if type==1 then
this.titleTxt.text="挑战"
this.btnText.text="免费挑战"
else
this.titleTxt.text="回放"
this.btnText.text="确定"
end
this.ShowInfo(msg)
this.RefreshBattleCastInfo()
--如果有结果list
if list then
state=3
resultList=list
for i = 1, 3 do
this.playBacks[i]:SetActive(true)
this.ShowBattleState(i,3)
end
end
end
function this.ShowInfo()
function this.ShowInfo(msg)
--我的信息
this.myName.text=PlayerManager.nickName
myInfoData=msg.myTeamInfo
enInfoData=msg.defTeamInfo
if msg.fightData then
fightDataList=msg.fightData
end
this.myName.text= PracticeManager.SetNameColor(JingJiShouWeiToEn(PlayerManager.nickName),msg.myTeamInfo.practiceLevel)
this.myServer.text= PracticeManager.SetNameColor(PlayerManager.serverInfo.name,1)
this.myRankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..1)
if not myHeadObj then
myHeadObj = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.myHeadPar.transform)
end
myHeadObj:Reset()
myHeadObj:SetScale(Vector3.one * 0.85)
myHeadObj:SetHead(data.head)
myHeadObj:SetFrame(data.headFrame)
myHeadObj:SetLevel(data.level)
myHeadObj:SetScale(Vector3.one * 0.7)
myHeadObj:SetHead(msg.myTeamInfo.head)
myHeadObj:SetFrame(msg.myTeamInfo.headFrame)
myHeadObj:SetLevel(msg.myTeamInfo.level)
myHeadObj:SetLayer(this.sortingOrder)
myHeadObj:SetEffectScale(0.9)
myHeadObj:SetEffectScale(0.7)
--敌人信息
this.rightName.text=PlayerManager.nickName
this.rightServer.text= PracticeManager.SetNameColor(PlayerManager.serverInfo.name,1)
this.enRankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..1)
this.rightName.text= PracticeManager.SetNameColor(msg.defTeamInfo.name,msg.defTeamInfo.practiceLevel)
this.rightServer.text= PracticeManager.SetNameColor(msg.defTeamInfo.serverName,1)
local enRank=WorldArenaManager.GetRankImgByScore(msg.defTeamInfo.crossTeamScore)
this.enRankImg.sprite=this.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..enRank)
if not enHeadObj then
enHeadObj = SubUIManager.Open(SubUIConfig.PlayerHeadView, this.enHeadPar.transform)
end
enHeadObj:Reset()
enHeadObj:SetScale(Vector3.one * 0.85)
enHeadObj:SetHead(data.head)
enHeadObj:SetFrame(data.headFrame)
enHeadObj:SetLevel(data.level)
enHeadObj:SetScale(Vector3.one * 0.7)
enHeadObj:SetHead(msg.defTeamInfo.head)
enHeadObj:SetFrame(msg.defTeamInfo.headFrame)
enHeadObj:SetLevel(msg.defTeamInfo.level)
enHeadObj:SetLayer(this.sortingOrder)
enHeadObj:SetEffectScale(0.9)
enHeadObj:SetEffectScale(0.7)
enemyId=msg.defTeamInfo.uid
LogError("state=="..state)
for i = 1, 3 do
if state==1 then
this.playBacks[i]:SetActive(false)
@ -222,15 +401,21 @@ function this.ShowInfo()
this.playBacks[i]:SetActive(true)
end
end
for i = 1, 3 do
Util.GetGameObject(this.leftTeam[i], "Text").gameObject:SetActive(state~=3)
Util.GetGameObject(this.rightTeam[i], "Text").gameObject:SetActive(state~=3)
local leftImg=Util.GetGameObject(this.leftTeam[i], "Image"):GetComponent("Image")
local rightImg=Util.GetGameObject(this.rightTeam[i], "Image"):GetComponent("Image")
LogError("myteam len=="..#msg.myTeamInfo.crossTeam[1].team)
this.SetTeamInfo(this.myTeamInfo,msg.myTeamInfo.crossTeam,1)
this.SetTeamInfo(this.enTeamInfo,msg.defTeamInfo.crossTeam)
end
function this.ShowBattleState(index,state)
--for i = 1, 3 do
Util.GetGameObject(this.leftTeam[index], "Text").gameObject:SetActive(state~=3)
Util.GetGameObject(this.rightTeam[index], "Text").gameObject:SetActive(state~=3)
local leftImg=Util.GetGameObject(this.leftTeam[index], "Image"):GetComponent("Image")
local rightImg=Util.GetGameObject(this.rightTeam[index], "Image"):GetComponent("Image")
leftImg.gameObject:SetActive(state==3)
rightImg.gameObject:SetActive(state==3)
if state==3 then
if resultList[i]==1 then
if resultList[index]==1 then
leftImg.sprite=this.spLoader:LoadSprite("UI_effect_JJC_JieSuan_ShengLi_png_zh")
rightImg.sprite=this.spLoader:LoadSprite("UI_effect_JJC_JieSuan_ShiBai_png_zh")
else
@ -239,9 +424,85 @@ function this.ShowInfo()
end
end
end
--end
end
--编队信息
local allTeams={}
function this.SetTeamInfo(_go,teamData,type)
for index = 1, 3 do
local go = Util.GetGameObject(_go,"defendbox"..index)
local data = teamData[index]
--local title = Util.GetGameObject(go,"Title"):GetComponent("Text")
local teamList ={}
for i = 1, 6 do
local aa=Util.GetGameObject(go,"Demons/heroPro ("..i..")")
table.insert(teamList,aa)
end
--title.text = string.format( "第%s队",NumToChinese[index])
--self:SetImgPos(go,data.totalForce)
for i, demon in ipairs(teamList) do
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(1))
Util.GetGameObject(demon, "pos"):GetComponent("Image").sprite=this.spLoader:LoadSprite("bd_xinkapaifan"..i)
Util.GetGameObject(demon, "hero"):SetActive(false)
end
--队伍阵容
local heroList={}
for i, hero in ipairs(data.team) do
local heroTid = data.team[i].heroTid
if heroTid then
local heroGo = Util.GetGameObject(teamList[hero.position], "hero")
heroGo:SetActive(true)
Util.GetGameObject(heroGo, "starGrid").transform.localScale=Vector3.one*0.7
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), hero.star,nil,nil,-15)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
Util.GetGameObject(teamList[hero.position], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
SetHeroIcon(this.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
local frameBtn = Util.GetGameObject(teamList[hero.position], "frame")
--local heroData = {}
-- Util.AddOnceClick(frameBtn, function()
-- NetManager.ViewHeroInfoRequest(self.playerId,hero.heroid,1,PLAYER_INFO_VIEW_TYPE.NORMAL,function(msg)
-- if not hero.heroid then
-- return
-- end
-- heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
-- GoodFriendManager.InitEquipData(msg.equip,heroData)
-- UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
-- end)
-- end)
if type and type==1 then
table.insert(heroList,{heroId=heroTid,position=hero.position})
end
end
end
if type and type==1 then
allTeams[index]=heroList
end
end
end
function this:OnClose()
if this.TimeCounter then
this.TimeCounter:Stop()
this.TimeCounter = nil
end
-- 执行关闭方法
if _CloseFunc then
-- 如果是挑战完成了,返回就刷新挑战列表
if state == 3 then
_CloseFunc()
end
_CloseFunc = nil
end
-- 重置状态
state = 1
isAnim = false
end
--界面销毁时调用(用于子类重写)
@ -252,6 +513,16 @@ function WorldArenaBattleInfoPanel:OnDestroy()
myHeadObj:Recycle()
myHeadObj = nil
end
if enHeadObj then
enHeadObj:Recycle()
enHeadObj = nil
end
resultList=nil
fightDataList=nil
if this.TimeCounter then
this.TimeCounter:Stop()
this.TimeCounter = nil
end
end

View File

@ -6,6 +6,10 @@ local MServerRankConfig=ConfigManager.GetConfig(ConfigName.MServerRankConfig)
local rewardBoxBtn
local titleLive
local myRank=0
local leftTimes=0
local battleTimes=0
local rewardState=nil
local enemyList={}
--初始化组件(用于子类重写)
function WorldArenaMainPanel:InitComponent()
this.spLoader = SpriteLoader.New()
@ -64,8 +68,8 @@ function WorldArenaMainPanel:BindEvent()
-- return
-- end
-- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.ARENA_DEFEND)
--UIManager.OpenPanel(UIName.WorldArenaMyTeamPanel, FORMATION_TYPE.ARENA_DEFEND)
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel)
UIManager.OpenPanel(UIName.WorldArenaMyTeamPanel,1)
--UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel)
end)
-- 挑战按钮
@ -89,14 +93,13 @@ function WorldArenaMainPanel:BindEvent()
return
end
end
-- 敌方数据获取
local EnemyList = ArenaManager.GetEnemyList()
if EnemyList[i] then
--直接主线阵容进战斗
-- 请求开始挑战
local isSkip = 0--ArenaManager.IsSkipFight() and 1 or 0
ArenaManager.RequestArenaChallenge(i, isSkip)
end
LogError("/////////////////")
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,enemyList[i],function(msg)
LogError("open battleinfo ???")
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function()
self:RefreshChallengeList()
end)
end)
else
PopupTipPanel.ShowTip(Language[10092])
end
@ -108,14 +111,7 @@ function WorldArenaMainPanel:BindEvent()
end)
-- 刷新按钮
Util.AddClick(this.RefreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
PopupTipPanel.ShowTip(Language[10075])
return
end
NetManager.CrossYuXuLunDaoChangeEnemyInfoRequest(function(msg)
this:RefreshEnemyData(msg.arenaEnemys)
end)
self:RefreshChallengeList()
end)
-- 记录按钮
Util.AddClick(this.RecordBtn, function()
@ -123,12 +119,15 @@ function WorldArenaMainPanel:BindEvent()
PopupTipPanel.ShowTip(Language[10075])
return
end
UIManager.OpenPanel(UIName.WorldArenaRecordPopup)
NetManager.CrossYuXuLunDaoBattleRecordRequest(PlayerManager.uid,function(msg)
UIManager.OpenPanel(UIName.WorldArenaRecordPopup,msg.recordData)
end)
ResetServerRedPointStatus(RedPointType.Arena_Record)
end)
-- 帮助按钮
Util.AddClick(this.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Arena,this.helpPosition.x,this.helpPosition.y)
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.YuXu,this.helpPosition.x,this.helpPosition.y)
end)
-- 奖励按钮
Util.AddClick(this.RewardBtn, function()
@ -138,50 +137,29 @@ function WorldArenaMainPanel:BindEvent()
end)
--商店按钮
Util.AddClick(this.StoreBtn, function()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
PopupTipPanel.ShowTip(Language[10075])
return
end
JumpManager.GoJump(20010)
JumpManager.GoJump(40032)
end)
-- 挑战按钮
for i, enemy in ipairs(this.Enemys) do
local challengeBtn = Util.GetGameObject(enemy, "challenge")
Util.AddClick(challengeBtn, function()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
PopupTipPanel.ShowTip(Language[10075])
return
end
-- 只在活动时间范围内可点
if ArenaManager.GetLeftTime() > 0 then
-- 添加次数限制
--local leftTimes = ArenaManager.GetArenaChallengeTimes()
if leftTimes <= 0 then
local itemId, needNum = ArenaManager.GetArenaChallengeCost()
local haveNum = BagManager.GetItemCountById(itemId)
if haveNum < needNum then
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.ChallengeTicket })
PopupTipPanel.ShowTip(Language[10078])
return
end
end
-- 敌方数据获取
local EnemyList = ArenaManager.GetEnemyList()
if EnemyList[i] then
--直接主线阵容进战斗
-- 请求开始挑战
local isSkip = 0--ArenaManager.IsSkipFight() and 1 or 0
ArenaManager.RequestArenaChallenge(i, isSkip)
end
else
PopupTipPanel.ShowTip(Language[10092])
end
end)
end
end
-- 刷新挑战列表
function WorldArenaMainPanel:RefreshChallengeList()
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
PopupTipPanel.ShowTip(Language[10075])
return
end
NetManager.CrossYuXuLunDaoChangeEnemyInfoRequest(function(msg)
PlaySoundWithoutClick("UI_refresh")
this:RefreshEnemyData(msg.arenaEnemys)
end)
end
--添加事件监听(用于子类重写)
function WorldArenaMainPanel:AddListener()
end
@ -189,28 +167,27 @@ end
--移除事件监听(用于子类重写)
function WorldArenaMainPanel:RemoveListener()
end
local rankData
local grid, rankData
--界面打开时调用(用于子类重写)
local leftTimes=0
local battleTimes=0
local rewardState=nil
function WorldArenaMainPanel:OnOpen(...)
-- 参数保存
local args = {...}
NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
local currRankId=msg.newLevelId
rankData=ConfigManager.GetConfigData(ConfigName.MServerRankConfig,currRankId)
LogError(" newMyscore=="..msg.newMyscore)
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
--rankData=ConfigManager.GetConfigData(ConfigName.MServerRankConfig,currRankId)
battleTimes=msg.changedTimes
rewardState=msg.dailyRewardState
leftTimes=msg.freeTimes
WorldArenaManager.SetFreeTime(leftTimes)
this.Integral.text="积分:"..msg.newMyscore
this.SetStarShow(rankData.RankGrade+1,self.sortingOrder)
this.SetStarShow(grid,self.sortingOrder)
this.endTime.text="周日23:30赛季结束"
LogError("len==="..#msg.arenaEnemys)
this:RefreshEnemyData(msg.arenaEnemys)
myRank=msg.myRank
LogError("免费次数=="..leftTimes)
this.freeTimes.text = string.format("%s次", math.max(leftTimes, 0))
end)
@ -219,19 +196,14 @@ end
--星级和段位图标显示
function this.SetStarShow(grade,layer)
for i = 1, #this.StarList do
if i>rankData.RankLevel then
this.StarList[i]:SetActive(false)
else
this.StarList[i]:SetActive(true)
end
end
-- 设置星级
WorldArenaManager.SetStarShow(this.StarList, rankData.RankLevel)
titleLive = poolManager:LoadAsset("fx_duanwei_0"..grade, PoolManager.AssetType.GameObject)
titleLive.transform:SetParent(this.rankPar.transform)
titleLive.transform.localPosition=Vector3.New(0,-600,0)
titleLive.transform.localScale =Vector3.New(1,1,1)
AddParticleSortLayer(titleLive,layer)
LogError("grade=="..grade.." star=="..rankData.RankLevel)
this.rankName.text=rankData.RankName
--this.RefreshEnemyData()
this.ShowRewardBoxProgressData()
@ -272,7 +244,7 @@ function this.ShowRewardBoxProgressData()
Util.GetGameObject(rewardBoxBtn[i], "getFinish"):SetActive(state == 3)
Util.AddOnceClick(rewardBoxBtn[i], function()
if state == 1 then
UIManager.OpenPanel(UIName.BoxRewardShowPopup,rewards[i][2].."#"..rewards[i][3],rewardBoxBtn[i].transform.localPosition.x,-400,rewards[i][1] .. Language[10100])
UIManager.OpenPanel(UIName.BoxRewardShowPopup,{{rewards[i][2], rewards[i][3]}},rewardBoxBtn[i].transform.localPosition.x,-400,rewards[i][1] .. Language[10100])
return
elseif state == 3 then
PopupTipPanel.ShowTip(Language[10101])
@ -299,7 +271,7 @@ function this:RefreshEnemyData(team)
--local leftTimes=time
table.sort(team, function(a,b) return a.score > b.score end)
local EnemyList =team -- ArenaManager.GetEnemyList()
enemyList={}
for i, node in ipairs(this.Enemys) do
node:SetActive(false)
if EnemyList[i] then
@ -346,20 +318,24 @@ function this:RefreshEnemyData(team)
this.HeadList[i]:SetScale(Vector3.one*0.8)
this.HeadList[i]:SetLayer(this.sortingOrder)
this.HeadList[i]:SetEffectScale(0.85)
table.insert(enemyList,EnemyList[i].uid)
Util.AddOnceClick(bg, function()
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid, PLAYER_INFO_VIEW_TYPE.ARENA)
LogError("uid=="..EnemyList[i].uid)
UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, EnemyList[i].uid,1)
end)
end
end
SecTorPlayAnim(prefab)
end
function WorldArenaMainPanel:OnFocus()
LogError("************//////")
end
-- 打开,重新打开时回调
function WorldArenaMainPanel:OnShow()
SoundManager.PlayMusic(SoundConfig.BGM_Arena)
LogError("**********")
end
function WorldArenaMainPanel:OnSortingOrderChange()
@ -382,6 +358,13 @@ function WorldArenaMainPanel:OnDestroy()
this.shopView = SubUIManager.Close(this.shopView)
this.shopView = nil
end
if this.HeadList then
for i = 1, #this.HeadList do
this.HeadList[i]:Recycle()
this.HeadList[i]=nil
end
end
end
--

View File

@ -3,19 +3,70 @@ local this = WorldArenaManager
local ArenaSetting = ConfigManager.GetConfig(ConfigName.MServerArenaSetting)
local rankConfig = ConfigManager.GetConfig(ConfigName.MServerRankConfig)
local oldScore=0
local newScore=0
local freeTimes
local myRankId=0
local challengeTime=0
local rewardList={}
function this.Initialize()
this.rank=0
this.star=0
rewardList={}
end
--添加奖励
function this.AddReward(drop)
if drop.itemlist then
for i = 1, #drop do
for j = 1, #drop[i].itemlist do
local item={}
item.itemId=drop[i].itemlist[j].itemId
item.itemNum=drop[i].itemlist[j].itemNum
table.insert(rewardList,item)
end
end
end
end
function this.SetMyData(rank,free,time)
myRankId=rank
freeTimes=free
challengeTime=time
end
function this.SetOldScore(num)
oldScore=num
end
function this.GetOldScore()
return oldScore
end
function this.SetNewScore(num)
newScore=num
end
function this.GetNewScore()
return newScore
end
function this.SetFreeTime(num)
freeTimes=num
end
function this.GetFreeTime()
return freeTimes
end
-- 获取竞技场剩余挑战次数
function this.GetArenaChallengeTimes()
local privilege = ArenaSetting[2].BattleFree
local allTimes = PrivilegeManager.GetPrivilegeNumber(privilege)
local leftTimes = PrivilegeManager.GetPrivilegeRemainValue(privilege)
return leftTimes, allTimes
return freeTimes, allTimes
end
-- 获取竞技场挑战消耗
@ -29,10 +80,25 @@ end
function this.GetRankImgByScore(num)
for k, v in ConfigPairs(rankConfig) do
if v.ScoreLow<num and v.ScoreUp>=num then
return v.RankGrade+1
return v.RankGrade+1,v
end
end
return 1
return 1,rankConfig[1]
end
local _StarShow = {
[0] = {0, 0, 0, 0, 0},
[1] = {0, 0, 1, 0, 0},
[2] = {0, 1, 0, 1, 0},
[3] = {0, 1, 1, 1, 0},
[4] = {1, 1, 0, 1, 1},
[5] = {1, 1, 1, 1, 1},
}
function this.SetStarShow(starList, starLv)
local ss = _StarShow[starLv]
for i = 1, #starList do
starList[i]:SetActive(ss[i] == 1)
end
end
return this

View File

@ -37,7 +37,7 @@ local function OnEndDrag(self, Pointgo, data)
for i = 1, 3 do
self.InfoList[i] = Util.GetGameObject(self.Content, "Grid ("..i..")/Info")
WorldArenaMyTeamPanel:Refresh()
-- WorldArenaMyTeamPanel:Refresh()
end
end
@ -103,11 +103,15 @@ function WorldArenaMyTeamPanel:OnShow()
end
function WorldArenaMyTeamPanel:Refresh()
NetManager.RequestPlayerInfo(self.playerId, PLAYER_INFO_VIEW_TYPE.NORMAL,1, function(msg)
for i = 1, 3 do
WorldArenaMyTeamPanel:SetSingleFormation(self.InfoList[i],msg.teamInfo.team,i)
end
end)
-- NetManager.GetPlayerCrossYxldOneTeamInfoRequest(PlayerManager.uid,0,function(msg)
-- for i = 1, 3 do
-- WorldArenaMyTeamPanel:SetSingleFormation(self.InfoList[i],msg.teamInfo.crossTeam[1],i)
-- end
-- end)
for i = 1, 3 do
local team=FormationManager.GetFormationByID(i+2000)
WorldArenaMyTeamPanel:SetSingleFormation(self.InfoList[i],team.teamHeroInfos,i)
end
end
function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
@ -116,7 +120,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
local btnChange = Util.GetGameObject(go,"ChangeTeam")
local teamList = Util.GetGameObject(go,"TeamList")
title.text = string.format( "第%s队",NumToChinese[index])
warPower.text = data.totalForce
--
Util.AddOnceClick(btnChange,function ()
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.WORLDARENA,index)
end)
@ -125,16 +129,20 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(1))
Util.GetGameObject(demon, "hero"):SetActive(false)
end
local allPower=0
--队伍阵容
for i, hero in ipairs(data.team) do
local heroTid = data.team[i].heroTid
for i, hero in pairs(data) do
local heroTid = data[i].heroId
LogError(" heroTid=="..heroTid)
if heroTid then
local heroGo = Util.GetGameObject(self.Heros[index][hero.position], "hero")
local heroData=HeroManager.GetSingleHeroData(heroTid)
heroGo:SetActive(true)
SetHeroStars(self.spLoader, Util.GetGameObject(heroGo, "starGrid"), hero.star)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroTid)
SetHeroStars(self.spLoader, Util.GetGameObject(heroGo, "starGrid"), heroData.star)
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
allPower=allPower+heroData.warPower
Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = hero.level
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text = heroData.lv
Util.GetGameObject(self.Heros[index][hero.position], "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star))
SetHeroIcon(self.spLoader, hero,Util.GetGameObject(heroGo, "icon"):GetComponent("Image"),heroConfig)
local frameBtn = Util.GetGameObject(self.Heros[index][hero.position], "frame")
@ -151,7 +159,7 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
end)
end
end
warPower.text = allPower
end
function WorldArenaMyTeamPanel:OnClose()

View File

@ -2,11 +2,18 @@ require("Base/BasePanel")
local WorldArenaOtherTeamPanel = Inherit(BasePanel)
local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig)
local type=0 --1:挑战 2详情
local itemId, needNum
local haveNum=0
local time=0
local enemyId
function WorldArenaOtherTeamPanel:InitComponent()
self.spLoader = SpriteLoader.New()
self.btnBack = Util.GetGameObject(self.gameObject, "Frame/BackBtn")
self.mask = Util.GetGameObject(self.gameObject, "mask")
self.content = Util.GetGameObject(self.gameObject, "Content")
self.costImg=Util.GetGameObject(self.content, "Button/Image"):GetComponent("Image")
self.costTxt=Util.GetGameObject(self.content, "Button/Image/num"):GetComponent("Text")
--玩家信息
self.playerInfo = Util.GetGameObject(self.content, "playerInfo")
self.playerHead = Util.GetGameObject(self.playerInfo, "head")
@ -38,6 +45,8 @@ function WorldArenaOtherTeamPanel:InitComponent()
self.imprintItemList = {}
--挑战
self.btnChallenge = Util.GetGameObject(self.content, "Button")
self.challengeTxt=Util.GetGameObject(self.content, "Button/Text"):GetComponent("Text")
end
@ -50,7 +59,17 @@ function WorldArenaOtherTeamPanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(self.btnChallenge, function()
PopupTipPanel.ShowTip("去挑战了")
if time==0 and haveNum<needNum then
PopupTipPanel.ShowTip("邀请函不足!")
return
end
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,self.playerId,function(msg)
LogError("open battleinfo ???")
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function()
--self:RefreshChallengeList()
end)
end)
--显示挑战界面
self:ClosePanel()
end)
end
@ -63,12 +82,23 @@ function WorldArenaOtherTeamPanel:RemoveListener()
end
--界面打开时调用(用于子类重写)
function WorldArenaOtherTeamPanel:OnOpen(_playerId)
function WorldArenaOtherTeamPanel:OnOpen(_playerId,_type)
self.playerId = _playerId
type=_type
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function WorldArenaOtherTeamPanel:OnShow()
itemId, needNum = WorldArenaManager.GetArenaChallengeCost()
haveNum = BagManager.GetItemCountById(itemId)
--设置挑战按钮显示
self.costImg.sprite = SetIcon(self.spLoader, itemId)
self.costTxt.text = "×"..needNum
self.costTxt.color = haveNum < needNum and UIColor.NOT_ENOUGH_RED or UIColor.BTN_TEXT
time=WorldArenaManager.GetFreeTime()
self.costImg.gameObject:SetActive(time<=0)
self.challengeTxt.gameObject:SetActive(time>0)
self.challengeTxt.text="免费挑战"
WorldArenaOtherTeamPanel:Refresh()
end
@ -79,11 +109,17 @@ function WorldArenaOtherTeamPanel:OnSortingOrderChange()
end
function WorldArenaOtherTeamPanel:Refresh()
NetManager.RequestPlayerInfo(self.playerId, PLAYER_INFO_VIEW_TYPE.NORMAL,1, function(msg)
LogError("self.playerid=="..self.playerId)
NetManager.GetPlayerCrossYxldOneTeamInfoRequest(self.playerId,0,function(msg)
WorldArenaOtherTeamPanel:SetPlayerInfo(self.playerInfo,msg.teamInfo)
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{msg.teamInfo.team,msg.teamInfo.team,msg.teamInfo.team})
WorldArenaOtherTeamPanel:SetTeamInfo(self.teamInfo,{msg.teamInfo.crossTeam[1],msg.teamInfo.crossTeam[2],msg.teamInfo.crossTeam[3]})
WorldArenaOtherTeamPanel:SetPokemonInfo(self.pokemonInfo,msg.teamInfo.team.PokemonInfos)
WorldArenaOtherTeamPanel:SetImprintInfo(self.imprintInfo,msg.teamInfo.team.sealShow)
if type==1 then
self.btnChallenge:SetActive(true)
else
self.btnChallenge:SetActive(false)
end
end)
end
@ -134,9 +170,10 @@ function WorldArenaOtherTeamPanel:SetPlayerInfo(go,playerData)
self.PlayerHead:SetLayer(self.sortingOrder)
self.PlayerHead:SetEffectScale(0.9)
name.text = PracticeManager.SetNameColor(playerData.name,playerData.practiceLevel)
score.text = string.format( "积分:%s",playerData.name )
levelImg.sprite = self.spLoader:LoadSprite("y_yuxulundao_xingxing")
name.text = PracticeManager.SetNameColor(playerData.serverName.." "..playerData.name,playerData.practiceLevel)
score.text = string.format( "积分:%s",playerData.crossTeamScore)
local rank=WorldArenaManager.GetRankImgByScore(playerData.crossTeamScore)
levelImg.sprite = self.spLoader:LoadSprite("y_yuxulundao_xiaobiao_0"..rank)
end
--编队信息

View File

@ -41,16 +41,16 @@ function WorldArenaRecordPopup:RemoveListener()
end
--界面打开时调用(用于子类重写)
function WorldArenaRecordPopup:OnOpen(...)
function WorldArenaRecordPopup:OnOpen(data)
-- 请求数据
ArenaManager.RequestArenaRecord()
-- ArenaManager.RequestArenaRecord()
-- 刷新显示
this.RefreshRecordList()
this.RefreshRecordList(data)
end
-- 刷新记录列表
function this.RefreshRecordList()
local recordList = ArenaManager.GetRecordList()
function this.RefreshRecordList(_data)
local recordList = _data
if (#recordList<1) then
this.roleImage:SetActive(true)
else
@ -74,27 +74,41 @@ function this.RankNodeAdapter(node, data)
local deltaScore = Util.GetGameObject(node, "deltaScore"):GetComponent("Text")
local deltaScoreGo = Util.GetGameObject(node, "deltaScore")
lv_name.text = "lv"..data.attackInfo.level.." "..data.attackInfo.name
integral.text = data.attackInfo.score
power.text = Language[10082]..data.attackInfo.totalForce
time.text = GetDeltaTimeStr(data.attackTime)
lv_name.text = "lv"..data.level.." "..data.userName
--integral.text = data.attackInfo.score
power.text = Language[10082]..data.power
time.text = GetDeltaTimeStr(data.time)
if not _PlayerHeadList[node] then
_PlayerHeadList[node] = SubUIManager.Open(SubUIConfig.PlayerHeadView, head.transform)
end
_PlayerHeadList[node]:Reset()
_PlayerHeadList[node]:SetScale(Vector3.one * 0.8)
_PlayerHeadList[node]:SetHead(data.attackInfo.head)
_PlayerHeadList[node]:SetFrame(data.attackInfo.headFrame)
_PlayerHeadList[node]:SetHead(data.head)
_PlayerHeadList[node]:SetFrame(data.headFrame)
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
_PlayerHeadList[node]:SetEffectScale(0.85)
local isWin = data.fightResult == 1
local resultStr = isWin and Language[10083] or Language[10084]
local isWin = false
local type=data.type
if type==1 or type==3 then
isWin=true
end
local info=nil
if type==1 then
info="挑战成功"
elseif type==2 then
info="挑战失败"
elseif type==3 then
info="防守成功"
elseif type==4 then
info="防守失败"
end
local scoreStr = isWin and "+"..data.myScoreChange or data.myScoreChange
if scoreStr==nil then
scoreStr=0
end
local color = isWin and UIColor.GREEN or UIColor.RED
result.text = resultStr
result.text = info
deltaScore.text =Language[11693].. scoreStr
result.color = color
deltaScore.color = color
@ -107,27 +121,88 @@ function this.RankNodeAdapter(node, data)
-- 给回放按钮添加事件
local replay = Util.GetGameObject(node, "replay")
Util.AddOnceClick(replay, function()
local nameStr = data.attackInfo.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.uid
arg.blue.name = data.attackInfo.name
arg.blue.head = data.attackInfo.head
arg.blue.frame = data.attackInfo.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 = HeadManager.GetCurFrameId()
arg.red.deltaScore = data.myScoreChange
UIManager.OpenPanel(UIName.ArenaResultPopup, arg)
end)
local windData={}
--我的队伍
local myTeamInfo={}
myTeamInfo.uid=PlayerManager.uid
myTeamInfo.level=PlayerManager.level
myTeamInfo.name=PlayerManager.nickName
myTeamInfo.head=PlayerManager.head
myTeamInfo.headFrame=HeadManager.GetCurFrameId()
myTeamInfo.practiceLevel= PracticeManager.PracticeLevel
myTeamInfo.serverName=PlayerManager.serverInfo.name
myTeamInfo.crossTeamScore=100
--敌方队伍
local enTeamInfo={}
enTeamInfo.uid=data.uid
enTeamInfo.level=data.level
enTeamInfo.head=data.head
enTeamInfo.headFrame=data.headFrame
enTeamInfo.practiceLevel= data.practiceLevel
enTeamInfo.serverName="s1"
enTeamInfo.name=data.userName
enTeamInfo.crossTeamScore=100
local fightDataList={data.fightData1,data.fightData2,data.fightData3}
--获取双方队伍数据
local allHeroTeam={}
local allEnTeam={}
for i = 1, #fightDataList do
local fightData=fightDataList[i]
local heroTeam={}
heroTeam.team={}
local enTeam={}
enTeam.team={}
for i = 1, #fightData.heroFightInfos.fightUnitList do
local hero=fightData.heroFightInfos.fightUnitList[i]
local newHero={}
newHero.heroTid=tonumber(hero.unitId)
local pro=string.split(hero.property,"#")
newHero.level=pro[1]
newHero.heroid=hero.realId
newHero.star=hero.star
newHero.position=hero.position
newHero.skinId=hero.skinId
table.insert(heroTeam.team,newHero)
end
for i = 1, #fightData.monsterList[1].fightUnitList do
local hero=fightData.monsterList[1].fightUnitList[i]
local newHero={}
newHero.heroTid=tonumber(hero.unitId)
local pro=string.split(hero.property,"#")
newHero.level=pro[1]
newHero.heroid=hero.realId
newHero.star=hero.star
newHero.position=hero.position
newHero.skinId=hero.skinId
table.insert(enTeam.team,newHero)
end
table.insert(allHeroTeam,heroTeam)
table.insert(allEnTeam,enTeam)
-- allHeroTeam[i]=heroTeam
-- allEnTeam[i]=enTeam
end
if type==1 or type==2 then
myTeamInfo.crossTeam=allHeroTeam
enTeamInfo.crossTeam=allEnTeam
-- myTeamInfo.crossTeam={}
-- myTeamInfo.crossTeam.team=allHeroTeam
-- enTeamInfo.crossTeam={}
-- enTeamInfo.crossTeam.team=allEnTeam
-- myTeamInfo.crossTeam={}
-- enTeamInfo.crossTean={}
-- for i = 1, 3 do
-- myTeamInfo.crossTeam[i].team=allHeroTeam[i]
-- enTeamInfo.crossTeam[i].team=allEnTeam[i]
-- end
else
myTeamInfo.crossTeam=allEnTeam
enTeamInfo.crossTeam=allHeroTeam
end
windData.myTeamInfo=myTeamInfo
windData.defTeamInfo=enTeamInfo
windData.fightData=fightDataList
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,windData,2,nil,data.resultList)
end)
end

View File

@ -3,14 +3,15 @@ WorldArenaUpRewardPanel = Inherit(BasePanel)
local this = WorldArenaUpRewardPanel
local RankConfig=ConfigManager.GetConfig(ConfigName.MServerRankConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local lastRankId=10
local currRankId=12
local lastScore=180
local currScore=212
local lastRankId=0
local currRankId=0
local lastScore=0
local currScore=0
local rankData
local maxScore
local minScore
local layer
local aaa
--初始化组件(用于子类重写)
function WorldArenaUpRewardPanel:InitComponent()
this.spLoader = SpriteLoader.New()
@ -33,11 +34,7 @@ function WorldArenaUpRewardPanel:InitComponent()
for i = 1, 5 do
table.insert(this.starList,Util.GetGameObject(self.gameObject, "Bg/starPar/Image"..i))
end
end
--绑定事件(用于子类重写)
function WorldArenaUpRewardPanel:BindEvent()
Util.AddClick(self.btn_close, function()
@ -54,7 +51,12 @@ function WorldArenaUpRewardPanel:OnOpen(...)
else
this.titleObj.gameObject:SetActive(false)
end
rankData=RankConfig[lastRankId]
lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore")
aaa, rankData=WorldArenaManager.GetRankImgByScore(lastScore)
lastRankId=rankData.Id
local grade, newRankData=WorldArenaManager.GetRankImgByScore(currScore)
currRankId=newRankData.Id
--rankData=RankConfig[lastRankId]
minScore=rankData.ScoreLow
maxScore=rankData.ScoreUp
currRank= rankData.RankGrade+1
@ -71,33 +73,24 @@ function WorldArenaUpRewardPanel:OnOpen(...)
this.progress.fillAmount=(lastScore-minScore)/(maxScore-minScore)
currRank=rankData.RankGrade
this.SetStarShow(rankData.RankLevel,rankData.RankGrade,self.sortingOrder)
this.StartProgressChange()
local callList2 = Stack.New()
local itemRandomDataList={}
local aaa={}
aaa.itemlist={}
for i = 1, 10 do
local item={}
item.itemId=16
item.itemNum=100
table.insert(aaa.itemlist,item)
end
itemRandomDataList=BagManager.GetTableByBackDropData(aaa)
local baseContentList2={}
this.SetItemShow(aaa,itemRandomDataList,this.grid.transform,callList2,baseContentList2)
this.StartProgressChange(function()
local callList2 = Stack.New()
local itemRandomDataList={}
local aaa={}
aaa.itemlist={}
aaa.itemlist=WorldArenaManager.rewardList
itemRandomDataList=BagManager.GetTableByBackDropData(aaa)
local baseContentList2={}
this.SetItemShow(aaa,itemRandomDataList,this.grid.transform,callList2,baseContentList2)
end)
end
--星级和段位图标显示
function this.SetStarShow(star,grade,layer)
for i = 1, #this.starList do
if i>rankData.RankLevel then
this.starList[i]:SetActive(false)
else
this.starList[i]:SetActive(true)
end
end
if currRank~=grade then
-- 设置星级
WorldArenaManager.SetStarShow(this.starList, rankData.RankLevel)
if currRank~=grade then
if titleLive then
destroy(titleLive)
LogError("grade=="..grade)
@ -107,9 +100,9 @@ function this.SetStarShow(star,grade,layer)
titleLive.transform.localPosition=Vector3.New(0,-600,0)
titleLive.transform.localScale =Vector3.New(1,1,1)
AddParticleSortLayer(titleLive,layer)
end
this.rankName.text=rankData.RankName
end
end
this.rankName.text=rankData.RankName
end
end
@ -173,13 +166,11 @@ local num=0
--走的条数
local walkNum=0
--开始进度条滚动
function this.StartProgressChange()
function this.StartProgressChange(func)
if this.TimeCounter then
this.TimeCounter=nil
end
if lastRankId>currRankId then
num=lastRankId-currRankId
end
local function _TimeUpdate()
--降低
if lastScore<currScore then
@ -213,6 +204,9 @@ function this.StartProgressChange()
if this.TimeCounter then
this.TimeCounter:Stop()
this.TimeCounter = nil
if func then
func()
end
end
end
this.scoreTxt.text=lastScore.."/"..maxScore
@ -227,6 +221,8 @@ function this.OnClose()
if this.TimeCounter then
this.TimeCounter:Stop()
this.TimeCounter = nil
WorldArenaManager.rewardList={}
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",currScore)
end
end