灵兽提交

zhangqiang 2020-10-20 20:18:02 +08:00
parent ab4fa7925d
commit 3a6c14f607
18 changed files with 3478 additions and 3347 deletions

View File

@ -1571,7 +1571,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: 2.1, y: 12.9}
m_AnchoredPosition: {x: 2.1, y: -7}
m_SizeDelta: {x: 46.01, y: 217.55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &309248663674038662
@ -1614,7 +1614,7 @@ MonoBehaviour:
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.3
m_LineSpacing: 1
m_Text: "\u51B0\u51E4"
LanguageIndex: 10916
--- !u!1 &350236474486349883
@ -5030,9 +5030,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -217.975}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842123276967952598
@ -5069,9 +5069,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -87.475}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842123277321908025
@ -5108,9 +5108,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -152.725}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842123277430703535
@ -5147,9 +5147,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -22.225}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4842429099848531319
@ -9972,7 +9972,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: -197, y: -396.6}
m_AnchoredPosition: {x: -82, y: -372}
m_SizeDelta: {x: 439.78, y: 50}
m_Pivot: {x: 0, y: 0}
--- !u!1 &7616254121184066567
@ -10147,9 +10147,9 @@ RectTransform:
m_Father: {fileID: 6274206863090052817}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -283.225}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7654655047400709787

View File

@ -827,8 +827,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: 14.799975, y: 41.600006}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -2.9, y: -30.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2110092724643846196
CanvasRenderer:
@ -935,8 +935,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: 10.799994, y: 120.6}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -6.9, y: 14.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1211480757464549250
CanvasRenderer:
@ -2328,8 +2328,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: 14.539972, y: 41.739975}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 19, y: -30.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &696859928917228885
CanvasRenderer:
@ -2515,8 +2515,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: 10.799994, y: 120.6}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 15.3, y: 48.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &386503851989509768
CanvasRenderer:
@ -3309,8 +3309,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: 14.539972, y: 41.739975}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -3.2, y: -47.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7796812443516381005
CanvasRenderer:
@ -3835,8 +3835,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: 10.799994, y: 120.6}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 15.3, y: 31.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &207237612488423332
CanvasRenderer:
@ -4250,8 +4250,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: 10.799994, y: 120.6}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -6.9, y: 31.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6807587731697601930
CanvasRenderer:
@ -5143,8 +5143,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: 14.799975, y: 41.600006}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 19.3, y: -47.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4030227507421189969
CanvasRenderer:
@ -5330,8 +5330,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: 14.539972, y: 41.739975}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -3.2, y: -64.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5005741341219182175
CanvasRenderer:
@ -6764,8 +6764,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: 14.799975, y: 41.600006}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -2.9, y: -64.6}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2280907154746738598
CanvasRenderer:
@ -7109,8 +7109,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: 10.799994, y: 120.6}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 15.3, y: 14.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5049862168731119685
CanvasRenderer:
@ -7984,8 +7984,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: 14.799975, y: 41.600006}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -2.9, y: -47.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8453044245111456832
CanvasRenderer:
@ -9650,8 +9650,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: 10.799994, y: 120.6}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -6.9, y: 48.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7620180537552380501
CanvasRenderer:
@ -9758,8 +9758,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: 14.539972, y: 41.739975}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 19, y: -47.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7908940722944239786
CanvasRenderer:
@ -9980,8 +9980,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: 14.799975, y: 41.600006}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 19.3, y: -64.6}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6819005008348073892
CanvasRenderer:
@ -10163,8 +10163,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: 14.799975, y: 41.600006}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 19.3, y: -30.5}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7319823175010399580
CanvasRenderer:
@ -10771,8 +10771,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: 14.539972, y: 41.739975}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: 19, y: -64.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8590090377273160711
CanvasRenderer:
@ -10993,8 +10993,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: 14.539972, y: 41.739975}
m_SizeDelta: {x: 378.8, y: 378.8}
m_AnchoredPosition: {x: -3.2, y: -30.4}
m_SizeDelta: {x: 361.3, y: 390.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7659484875893085427
CanvasRenderer:

View File

@ -128,7 +128,6 @@ TEAMPOSINFO = protobuf.Descriptor();
TEAMPOSINFO_TEAMID_FIELD = protobuf.FieldDescriptor();
TEAMPOSINFO_TEAMNAME_FIELD = protobuf.FieldDescriptor();
TEAMPOSINFO_TEAMHEROINFOS_FIELD = protobuf.FieldDescriptor();
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD = protobuf.FieldDescriptor();
POKEMONCOMONPENT = protobuf.Descriptor();
POKEMONCOMONPENT_ID_FIELD = protobuf.FieldDescriptor();
POKEMONCOMONPENT_LEVEL_FIELD = protobuf.FieldDescriptor();
@ -1740,9 +1739,9 @@ TEAMPOKEMONINFO_POKEMONID_FIELD.number = 2
TEAMPOKEMONINFO_POKEMONID_FIELD.index = 1
TEAMPOKEMONINFO_POKEMONID_FIELD.label = 1
TEAMPOKEMONINFO_POKEMONID_FIELD.has_default_value = false
TEAMPOKEMONINFO_POKEMONID_FIELD.default_value = 0
TEAMPOKEMONINFO_POKEMONID_FIELD.type = 5
TEAMPOKEMONINFO_POKEMONID_FIELD.cpp_type = 1
TEAMPOKEMONINFO_POKEMONID_FIELD.default_value = ""
TEAMPOKEMONINFO_POKEMONID_FIELD.type = 9
TEAMPOKEMONINFO_POKEMONID_FIELD.cpp_type = 9
TEAMPOKEMONINFO.name = "TeamPokemonInfo"
TEAMPOKEMONINFO.full_name = ".com.ljsd.jieling.protocols.TeamPokemonInfo"
@ -1782,22 +1781,11 @@ TEAMPOSINFO_TEAMHEROINFOS_FIELD.message_type = TEAMHEROINFO
TEAMPOSINFO_TEAMHEROINFOS_FIELD.type = 11
TEAMPOSINFO_TEAMHEROINFOS_FIELD.cpp_type = 10
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.name = "teamPokemonInfos"
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo.teamPokemonInfos"
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.number = 4
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.index = 3
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.label = 3
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.has_default_value = false
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.default_value = {}
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.message_type = TEAMPOKEMONINFO
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.type = 11
TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD.cpp_type = 10
TEAMPOSINFO.name = "TeamPosInfo"
TEAMPOSINFO.full_name = ".com.ljsd.jieling.protocols.TeamPosInfo"
TEAMPOSINFO.nested_types = {}
TEAMPOSINFO.enum_types = {}
TEAMPOSINFO.fields = {TEAMPOSINFO_TEAMID_FIELD, TEAMPOSINFO_TEAMNAME_FIELD, TEAMPOSINFO_TEAMHEROINFOS_FIELD, TEAMPOSINFO_TEAMPOKEMONINFOS_FIELD}
TEAMPOSINFO.fields = {TEAMPOSINFO_TEAMID_FIELD, TEAMPOSINFO_TEAMNAME_FIELD, TEAMPOSINFO_TEAMHEROINFOS_FIELD}
TEAMPOSINFO.is_extendable = false
TEAMPOSINFO.extensions = {}
POKEMONCOMONPENT_ID_FIELD.name = "id"

View File

@ -127,6 +127,10 @@ FASTFIGHTCHALLENGERESPONSE = protobuf.Descriptor();
FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD = protobuf.FieldDescriptor();
FASTFIGHTCHALLENGERESPONSE_HURT_FIELD = protobuf.FieldDescriptor();
FASTFIGHTCHALLENGERESPONSE_FIGHTDATA_FIELD = protobuf.FieldDescriptor();
RECHARGEINFOINDICATION = protobuf.Descriptor();
RECHARGEINFOINDICATION_RECHARGEID_FIELD = protobuf.FieldDescriptor();
RECHARGEINFOINDICATION_BUYCOUNT_FIELD = protobuf.FieldDescriptor();
RECHARGEINFOINDICATION_LEFTTIME_FIELD = protobuf.FieldDescriptor();
FIGHTSTARTREQUEST_FIGHTTYPE_FIELD.name = "fightType"
FIGHTSTARTREQUEST_FIGHTTYPE_FIELD.full_name = ".com.ljsd.jieling.protocols.FightStartRequest.fightType"
@ -1294,6 +1298,43 @@ FASTFIGHTCHALLENGERESPONSE.enum_types = {}
FASTFIGHTCHALLENGERESPONSE.fields = {FASTFIGHTCHALLENGERESPONSE_SCORE_FIELD, FASTFIGHTCHALLENGERESPONSE_HURT_FIELD, FASTFIGHTCHALLENGERESPONSE_FIGHTDATA_FIELD}
FASTFIGHTCHALLENGERESPONSE.is_extendable = false
FASTFIGHTCHALLENGERESPONSE.extensions = {}
RECHARGEINFOINDICATION_RECHARGEID_FIELD.name = "rechargeId"
RECHARGEINFOINDICATION_RECHARGEID_FIELD.full_name = ".com.ljsd.jieling.protocols.RechargeInfoIndication.rechargeId"
RECHARGEINFOINDICATION_RECHARGEID_FIELD.number = 1
RECHARGEINFOINDICATION_RECHARGEID_FIELD.index = 0
RECHARGEINFOINDICATION_RECHARGEID_FIELD.label = 1
RECHARGEINFOINDICATION_RECHARGEID_FIELD.has_default_value = false
RECHARGEINFOINDICATION_RECHARGEID_FIELD.default_value = 0
RECHARGEINFOINDICATION_RECHARGEID_FIELD.type = 5
RECHARGEINFOINDICATION_RECHARGEID_FIELD.cpp_type = 1
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.name = "buyCount"
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.full_name = ".com.ljsd.jieling.protocols.RechargeInfoIndication.buyCount"
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.number = 2
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.index = 1
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.label = 1
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.has_default_value = false
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.default_value = 0
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.type = 5
RECHARGEINFOINDICATION_BUYCOUNT_FIELD.cpp_type = 1
RECHARGEINFOINDICATION_LEFTTIME_FIELD.name = "leftTime"
RECHARGEINFOINDICATION_LEFTTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.RechargeInfoIndication.leftTime"
RECHARGEINFOINDICATION_LEFTTIME_FIELD.number = 3
RECHARGEINFOINDICATION_LEFTTIME_FIELD.index = 2
RECHARGEINFOINDICATION_LEFTTIME_FIELD.label = 1
RECHARGEINFOINDICATION_LEFTTIME_FIELD.has_default_value = false
RECHARGEINFOINDICATION_LEFTTIME_FIELD.default_value = 0
RECHARGEINFOINDICATION_LEFTTIME_FIELD.type = 5
RECHARGEINFOINDICATION_LEFTTIME_FIELD.cpp_type = 1
RECHARGEINFOINDICATION.name = "RechargeInfoIndication"
RECHARGEINFOINDICATION.full_name = ".com.ljsd.jieling.protocols.RechargeInfoIndication"
RECHARGEINFOINDICATION.nested_types = {}
RECHARGEINFOINDICATION.enum_types = {}
RECHARGEINFOINDICATION.fields = {RECHARGEINFOINDICATION_RECHARGEID_FIELD, RECHARGEINFOINDICATION_BUYCOUNT_FIELD, RECHARGEINFOINDICATION_LEFTTIME_FIELD}
RECHARGEINFOINDICATION.is_extendable = false
RECHARGEINFOINDICATION.extensions = {}
AdventureBossFindIndication = protobuf.Message(ADVENTUREBOSSFINDINDICATION)
AdventureBossInfoResponse = protobuf.Message(ADVENTUREBOSSINFORESPONSE)
@ -1321,6 +1362,7 @@ MainLevelFightUpdateIndication = protobuf.Message(MAINLEVELFIGHTUPDATEINDICATION
MainLevelRankInfoResponse = protobuf.Message(MAINLEVELRANKINFORESPONSE)
QuickStartMonsterFightRequest = protobuf.Message(QUICKSTARTMONSTERFIGHTREQUEST)
QuickStartMonsterFightResponse = protobuf.Message(QUICKSTARTMONSTERFIGHTRESPONSE)
RechargeInfoIndication = protobuf.Message(RECHARGEINFOINDICATION)
SweepRightRequest = protobuf.Message(SWEEPRIGHTREQUEST)
SweepRightResponse = protobuf.Message(SWEEPRIGHTRESPONSE)
TakeAventureRewardRequest = protobuf.Message(TAKEAVENTUREREWARDREQUEST)

View File

@ -81,6 +81,9 @@ GETALLEQUIPRESPONSE_EQUIP_FIELD = protobuf.FieldDescriptor();
GETALLEQUIPRESPONSE_ISSENDFINISH_FIELD = protobuf.FieldDescriptor();
GETALLPOKEMONRESPONSE = protobuf.Descriptor();
GETALLPOKEMONRESPONSE_POKEMONINFO_FIELD = protobuf.FieldDescriptor();
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD = protobuf.FieldDescriptor();
REPLACETEAMPOKEMONINFOREQUEST = protobuf.Descriptor();
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD = protobuf.FieldDescriptor();
POKENMONUPLEVELREQUEST = protobuf.Descriptor();
POKENMONUPLEVELREQUEST_POKEMONID_FIELD = protobuf.FieldDescriptor();
POKENMONUPLEVELREQUEST_LEVEL_FIELD = protobuf.FieldDescriptor();
@ -840,13 +843,42 @@ GETALLPOKEMONRESPONSE_POKEMONINFO_FIELD.message_type = CommonProto_pb.POKEMONINF
GETALLPOKEMONRESPONSE_POKEMONINFO_FIELD.type = 11
GETALLPOKEMONRESPONSE_POKEMONINFO_FIELD.cpp_type = 10
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.name = "teamPokemonInfos"
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.GetAllPokemonResponse.teamPokemonInfos"
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.number = 2
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.index = 1
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.label = 3
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.has_default_value = false
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.default_value = {}
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.message_type = CommonProto_pb.TEAMPOKEMONINFO
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.type = 11
GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD.cpp_type = 10
GETALLPOKEMONRESPONSE.name = "GetAllPokemonResponse"
GETALLPOKEMONRESPONSE.full_name = ".com.ljsd.jieling.protocols.GetAllPokemonResponse"
GETALLPOKEMONRESPONSE.nested_types = {}
GETALLPOKEMONRESPONSE.enum_types = {}
GETALLPOKEMONRESPONSE.fields = {GETALLPOKEMONRESPONSE_POKEMONINFO_FIELD}
GETALLPOKEMONRESPONSE.fields = {GETALLPOKEMONRESPONSE_POKEMONINFO_FIELD, GETALLPOKEMONRESPONSE_TEAMPOKEMONINFOS_FIELD}
GETALLPOKEMONRESPONSE.is_extendable = false
GETALLPOKEMONRESPONSE.extensions = {}
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.name = "teamPokemonInfos"
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.full_name = ".com.ljsd.jieling.protocols.ReplaceTeamPokemonInfoRequest.teamPokemonInfos"
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.number = 1
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.index = 0
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.label = 3
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.has_default_value = false
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.default_value = {}
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.message_type = CommonProto_pb.TEAMPOKEMONINFO
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.type = 11
REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD.cpp_type = 10
REPLACETEAMPOKEMONINFOREQUEST.name = "ReplaceTeamPokemonInfoRequest"
REPLACETEAMPOKEMONINFOREQUEST.full_name = ".com.ljsd.jieling.protocols.ReplaceTeamPokemonInfoRequest"
REPLACETEAMPOKEMONINFOREQUEST.nested_types = {}
REPLACETEAMPOKEMONINFOREQUEST.enum_types = {}
REPLACETEAMPOKEMONINFOREQUEST.fields = {REPLACETEAMPOKEMONINFOREQUEST_TEAMPOKEMONINFOS_FIELD}
REPLACETEAMPOKEMONINFOREQUEST.is_extendable = false
REPLACETEAMPOKEMONINFOREQUEST.extensions = {}
POKENMONUPLEVELREQUEST_POKEMONID_FIELD.name = "pokemonId"
POKENMONUPLEVELREQUEST_POKEMONID_FIELD.full_name = ".com.ljsd.jieling.protocols.PokenmonUpLevelRequest.pokemonId"
POKENMONUPLEVELREQUEST_POKEMONID_FIELD.number = 1
@ -1416,6 +1448,7 @@ OptHeroSoul = protobuf.Message(OPTHEROSOUL)
PokemonAdvancedRequest = protobuf.Message(POKEMONADVANCEDREQUEST)
PokenmonUpLevelRequest = protobuf.Message(POKENMONUPLEVELREQUEST)
PokenmonUpLevelResponse = protobuf.Message(POKENMONUPLEVELRESPONSE)
ReplaceTeamPokemonInfoRequest = protobuf.Message(REPLACETEAMPOKEMONINFOREQUEST)
RingFirAdvanceRequest = protobuf.Message(RINGFIRADVANCEREQUEST)
RingFireLoadRequest = protobuf.Message(RINGFIRELOADREQUEST)
SaveHeroChangeRequest = protobuf.Message(SAVEHEROCHANGEREQUEST)

File diff suppressed because one or more lines are too long

View File

@ -26,7 +26,7 @@ end
function this.UpdateBagData(_itemData, isNoSendNewItemEvent)
isNoSendNewItemEvent = isNoSendNewItemEvent or false
local itemdata = {}
--Log("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum)
Log("_itemData.itemId -=-=-=-=-=-=-=-=-=-=-=-=-=-=- ".._itemData.itemId.." ".._itemData.itemNum)
local _itemCfgData = itemConfig[_itemData.itemId]
if _itemCfgData ~= nil then
itemdata.itembackData = _itemData

View File

@ -62,11 +62,11 @@ function this.UpdateFormation(msg)
table.insert(oTeam.teamHeroInfos, teamHeroInfo)
HeroManager.SetHeroFormationList(teamHeroInfo.heroId,team.teamId,1)
end
for j = 1, #team.teamPokemonInfos do
local teamPokemonInfo = team.teamPokemonInfos[j]
table.insert(oTeam.teamPokemonInfos, teamPokemonInfo)
end
oTeam.teamPokemonInfos = {}
-- for j = 1, #team.teamPokemonInfos do
-- local teamPokemonInfo = team.teamPokemonInfos[j]
-- table.insert(oTeam.teamPokemonInfos, teamPokemonInfo)
-- end
this.formationList[team.teamId] = oTeam
end

View File

@ -908,15 +908,16 @@ function this.DiffMonsterRequest(func)
local msg = HeroInfoProto_pb.GetAllPokemonResponse()
msg:ParseFromString(data)
local pokemonInfo = {}
for i = 1, 8 do
local singledata = {}
singledata.tempId = 20000 + i
singledata.id = tostring((20000 + i))
singledata.star =1
singledata.level = 1
table.insert(pokemonInfo,singledata)
end
PokemonManager.InitPokemonsData(pokemonInfo)--msg.pokemonInfo)
-- for i = 1, 8 do
-- local singledata = {}
-- singledata.tempId = 20000 + i
-- singledata.id = tostring((20000 + i))
-- singledata.star =2
-- singledata.level = 2
-- table.insert(pokemonInfo,singledata)
-- end
PokemonManager.InitPokemonsData(msg.pokemonInfo)--pokemonInfo)
PokemonManager.UpdatePokemonFormationDatas(msg.teamPokemonInfos)--msg.pokemonInfo)
if func then
func(msg)
end
@ -4515,4 +4516,25 @@ function this.UpPokemonStarRequest(pokemonDId, func)
end
end)
end
--替换灵兽编队
function this.ReplaceTeamPokemonInfoRequest(_teamPokemonInfos, func)
local data = HeroInfoProto_pb.ReplaceTeamPokemonInfoRequest()
for i = 1, #_teamPokemonInfos do
LogPink("_teamPokemonInfos[i] ".._teamPokemonInfos[i].position)
-- data.teamPokemonInfos:append(_teamPokemonInfos[i])
if _teamPokemonInfos[i] and _teamPokemonInfos[i].pokemonId then
local c = data.teamPokemonInfos:add()
c.position = _teamPokemonInfos[i].position
c.pokemonId =_teamPokemonInfos[i].pokemonId
end
end
local msg = data:SerializeToString()
Network:SendMessageWithCallBack(MessageTypeProto_pb.POKEMON_REPLACE_REQUEST, MessageTypeProto_pb.POKEMON_REPLACE_RESPONSE, msg, function(buffer)
-- local data = buffer:DataByte()
-- msg:ParseFromString(data)
if func then
func(msg)
end
end)
end
return this

View File

@ -151,12 +151,19 @@ function PokemonInfoPanel:BindEvent()
--休息 下阵
Util.AddClick(this.restBtn, function()
--下阵协议
-- NetManager
local oldWarPower = 0
PokemonManager.RefreshPokemonFormation(Pokemon_Formation_RefreshType.DownZhen,curPokemonData.dynamicId)
local newWarPower = 0
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
local curFormation = PokemonManager.GetAllPokemonFormationData()
for i = 1, #curFormation do
if curFormation[i] and curFormation[i].pokemonId and curFormation[i].pokemonId == curPokemonData.dynamicId then
curFormation[i].pokemonId = nil
end
end
NetManager.ReplaceTeamPokemonInfoRequest(curFormation, function()
local oldWarPower = 0
PokemonManager.RefreshPokemonFormation(Pokemon_Formation_RefreshType.DownZhen,curPokemonData.dynamicId)
local newWarPower = 0
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end)
end)
end
@ -307,7 +314,7 @@ function this.UpdateHeroInfoData()
--SetHeroStars(starGrid, heroData.star,1,nil,nil,Vector2.New(0,1))
--常规属性赋值
local upZhenDidis = PokemonManager.GetAllPokemonFormationDids()
local sortIndex = upZhenDidis[curPokemonData.dynamicId].position or 0
local sortIndex = upZhenDidis[curPokemonData.dynamicId] and upZhenDidis[curPokemonData.dynamicId].position or 0
this.namne.text = curPokemonConFigData.Name
this.sortText:SetActive(sortIndex > 0)
this.sortText:GetComponent("Text").text = sortIndex

View File

@ -12,7 +12,7 @@ this.trigger = {}
--初始化组件(用于子类重写)
function PokemonMainPanel:InitComponent()
this.btnBack = Util.GetGameObject(self.transform, "btnBack")
this.btnHelp = Util.GetGameObject(self.transform, "helpBtn")
this.btnHelp = Util.GetGameObject(self.transform, "btnhelp")
this.btnShop = Util.GetGameObject(self.transform, "btnEndRoot/btnShop")
this.btnInfo = Util.GetGameObject(self.transform, "btnEndRoot/btnInfo")
this.btnWarAddPro = Util.GetGameObject(self.transform, "btnEndRoot/btnWarAddPro")
@ -55,7 +55,7 @@ function PokemonMainPanel:BindEvent()
end)
Util.AddClick(this.btnHelp, function()
local pos = this.btnHelp.transform.localPosition
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Adventure, pos.x, pos.y)
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.GuildCarDelay, pos.x, pos.y)
end)
Util.AddClick(this.btnShop, function()
JumpManager.GoJump(20003)
@ -102,7 +102,7 @@ end
local nextOpenLockIndex = 0
function this.ShowPokemonList()
nextOpenLockIndex = 0
PokemonDataList = {{},{},{},{},{},{}}
PokemonDataList = PokemonManager.GetAllPokemonFormationData()
for i = 1, #PokemonList do
this.ShowSinglePokemonList(PokemonList[i],PokemonDataList[i],i)
end
@ -125,7 +125,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
local state = 1--1 未解锁 隐藏 2 即将解锁 3 已解锁 未上阵 4 已解锁 已上阵
if pokemonPosLocks[liveIndex] <= PlayerManager.level then
state = 3
if singleData and singleData.dynamicId then
if singleData and singleData.pokemonId then
state = 4
end
else
@ -162,13 +162,14 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
live2dList[liveIndex] = nil
end
end
local LiveName = GetResourcePath(singleData.config.Live)
local live2d = poolManager:LoadLive(LiveName, curPokemonLive.transform,Vector3.one * heroConfig.Scale, Vector3.New(heroConfig.Position[1],heroConfig.Position[2],0))
live2dList[liveIndex] = {name=configData.Icon, go=live2d}
local curData = PokemonManager.GetSinglePokemonData( singleData.pokemonId)
local LiveName = curData.live
local live2d = poolManager:LoadLive(LiveName, curPokemonLive.transform,Vector3.one * 0.3, Vector3.New(curData.position[1],curData.position[2],0))--curData.scale
live2dList[liveIndex] = {name=curData.live, go=live2d}
local starSize = Vector2.New(65,65)
SetHeroStars(Util.GetGameObject(go, "upZhenInfo/starGrid"), singleData.star,1,starSize,0,Vector2.New(0.5,0.5))
SetHeroStars(Util.GetGameObject(go, "upZhenInfo/starGrid"), curData.star,1,starSize,0,Vector2.New(0.5,0.5))
Util.AddOnceClick( Util.GetGameObject(go, "upZhenInfo/upZhenClick"), function()
UIManager.OpenPanel(UIName.PokemonInfoPanel,singleData,PokemonManager.GetPokemonDatas())
UIManager.OpenPanel(UIName.PokemonInfoPanel,curData,PokemonManager.GetPokemonDatas())
end)
end
end
@ -181,7 +182,7 @@ function this.OnPointerDown(Pointgo,data)--按下
local _j=tonumber(string.sub(Pointgo.transform.name,-1))
local pokemonObj=Util.GetTransform(Pointgo.transform.parent,"pokemon".._j)
pokemonObj:DOScale(Vector3.one * 1.2, 0.15)
pokemonObj.transform:SetParent(this.root.transform)
pokemonObj.transform:SetParent(PokemonList[_j].transform)
pokemonObj:GetComponent("Image").raycastTarget = false
end
function this.OnPointerUp(Pointgo,data)--抬起

View File

@ -10,7 +10,7 @@ function this.Initialize()
pokemonFormation = {}
for i = 1, 6 do
local teamInfo = {}
teamInfo.pokemonDid = nil
teamInfo.pokemonId = nil
teamInfo.position = i
table.insert(pokemonFormation, teamInfo)
end
@ -232,9 +232,10 @@ end
--刷新本地灵兽编队数据
function this.UpdatePokemonFormationDatas(_msgPokemonFormationList)
for i = 1, #pokemonFormation do
if _msgPokemonFormationList[i] and _msgPokemonFormationList[i].pokemonDid then
if _msgPokemonFormationList[i] and _msgPokemonFormationList[i].pokemonId then
if i == _msgPokemonFormationList[i].position then
pokemonFormation[i].pokemonDid = _msgPokemonFormationList[i].pokemonDid
LogPink("_msgPokemonFormationList[i].pokemonId ".._msgPokemonFormationList[i].pokemonId)
pokemonFormation[i].pokemonId = _msgPokemonFormationList[i].pokemonId
end
end
end
@ -247,8 +248,8 @@ end
function this.GetAllPokemonFormationSids()
local formationSids = {}
for i = 1, #pokemonFormation do
if pokemons[pokemonFormation[i].pokemonDid] then
formationSids[pokemons[pokemonFormation[i].pokemonDid].id] = pokemons[pokemonFormation[i].pokemonDid]
if pokemons[pokemonFormation[i].pokemonId] then
formationSids[pokemons[pokemonFormation[i].pokemonId].id] = pokemons[pokemonFormation[i].pokemonId]
end
end
return formationSids
@ -257,8 +258,8 @@ end
function this.GetAllPokemonFormationDids()
local formationDids = {}
for i = 1, #pokemonFormation do
if pokemons[pokemonFormation[i].pokemonDid] then
formationDids[pokemonFormation[i].pokemonDid] = pokemonFormation[i]
if pokemons[pokemonFormation[i].pokemonId] then
formationDids[pokemonFormation[i].pokemonId] = pokemonFormation[i]
end
end
return formationDids
@ -280,17 +281,17 @@ function this.RefreshPokemonFormation(type,did,pos)
if pos then
if pokemonFormation[i].position == pos then
if type == Pokemon_Formation_RefreshType.UpZhen then
pokemonFormation[i].pokemonDid = did
pokemonFormation[i].pokemonId = did
elseif type == Pokemon_Formation_RefreshType.DownZhen then
pokemonFormation[i].pokemonDid = nil
pokemonFormation[i].pokemonId = nil
elseif type == Pokemon_Formation_RefreshType.Replace then
pokemonFormation[i].pokemonDid = did
pokemonFormation[i].pokemonId = did
end
end
else--只有下阵
if type == Pokemon_Formation_RefreshType.DownZhen then
if pokemonFormation[i].pokemonDid == did then
pokemonFormation[i].pokemonDid = nil
if pokemonFormation[i].pokemonId == did then
pokemonFormation[i].pokemonId = nil
end
end
end

View File

@ -111,6 +111,7 @@ function this.OnShowData()
local itemParent = Util.GetGameObject(upStarMaterialsPre[i],"itemParent")
local num = Util.GetGameObject(upStarMaterialsPre[i],"num"):GetComponent("Text")
if upStarMaterialsData[i] then
upStarMaterialsPre[i]:SetActive(true)
local configMaterialId = upStarMaterialsData[i][1]
local configMaterialNum = upStarMaterialsData[i][2]
SubUIManager.Open(SubUIConfig.ItemView, itemParent.transform):OnOpen(false, {configMaterialId,0}, 0.97)
@ -137,6 +138,8 @@ function this.OnShowData()
-- go.transform:Find("Image").gameObject:SetActive(false)--隐藏加号
num.text=string.format("<color=#FFFFFFFF>%s/%s</color>",PrintWanNum2(curMaterialBagNum),PrintWanNum2(configMaterialNum))
end
else
upStarMaterialsPre[i]:SetActive(false)
end
end

View File

@ -108,9 +108,9 @@ function this.SingPokemonDataShow(_go,_itemData)
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
Util.GetGameObject(_go.transform,"pokemonStateText"):GetComponent("Text").text="休息中"
local starSize = Vector2.New(50,50)
SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize,-5,Vector2.New(0.5,0.5))
SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5))
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData)
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonDatas())
end)
end
function this.SingPokemonChipDataShow(_go,_itemData)
@ -127,30 +127,35 @@ function this.SingPokemonChipDataShow(_go,_itemData)
end)
end
function this.PokemonDataSort(pokemonList)
local AllPokemonFormationDids = PokemonManager.GetAllPokemonFormationDids()
table.sort(pokemonList, function(a,b)
if spiritAnimal[a.id].Quality == spiritAnimal[b.id].Quality then
if a.star == b.star then
if a.lv == b.lv then
return a.id < b.id
if AllPokemonFormationDids[a.dynamicId] and AllPokemonFormationDids[b.dynamicId] or not AllPokemonFormationDids[a.dynamicId] and not AllPokemonFormationDids[b.dynamicId] then
if spiritAnimal[a.id].Quality == spiritAnimal[b.id].Quality then
if a.star == b.star then
if a.lv == b.lv then
return a.id < b.id
else
return a.lv > b.lv
end
else
return a.lv > b.lv
return a.star > b.star
end
else
return a.star > b.star
return spiritAnimal[a.id].Quality > spiritAnimal[b.id].Quality
end
else
return spiritAnimal[a.id].Quality > spiritAnimal[b.id].Quality
return AllPokemonFormationDids[a.dynamicId] and not AllPokemonFormationDids[b.dynamicId]
end
end)
end
function this.PokemonChipDataSort(pokemonChipList)
-- table.sort(pokemonChipList, function(a,b)
-- if spiritAnimal[a.id].Quality == spiritAnimal[b.id].Quality then
-- else
-- return spiritAnimal[a.id].Quality > spiritAnimal[b.id].Quality
-- end
-- end)
table.sort(pokemonChipList, function(a,b)
if itemConfig[a.id].Quantity == itemConfig[b.id].Quantity then
return a.id < b.id
else
return itemConfig[a.id].Quantity > itemConfig[b.id].Quantity
end
end)
end
-- tab节点显示自定义
function this.TabAdapter(tab, index, status)

View File

@ -82,7 +82,7 @@ function this.SingleItemDataShow(_go,_itemData)
local pos
local allPokemonFormation = PokemonManager.GetAllPokemonFormationData()
for i = 1, #allPokemonFormation do
if allPokemonFormation[i].pokemonDid == curUpZhenPokemonData.dynamicId then
if allPokemonFormation[i].pokemonid == curUpZhenPokemonData.dynamicId then
pos = allPokemonFormation[i].position
end
end
@ -94,13 +94,27 @@ function this.SingleItemDataShow(_go,_itemData)
else
--上阵 协议
-- NetManager
local oldWarPower = 0
if upZhenIndex then
PokemonManager.RefreshPokemonFormation(Pokemon_Formation_RefreshType.UpZhen,_itemData.dynamicId,upZhenIndex)
local curFormation = PokemonManager.GetAllPokemonFormationData()
LogPink("#curFormation "..#curFormation)
for i = 1, #curFormation do
if curFormation[i] and curFormation[i].position and curFormation[i].position == upZhenIndex then
curFormation[i].pokemonId = _itemData.dynamicId
LogPink("_itemData.dynamicId ".._itemData.dynamicId)
end
end
local newWarPower = 0
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
NetManager.ReplaceTeamPokemonInfoRequest(curFormation, function()
local oldWarPower = 0
if upZhenIndex then
PokemonManager.RefreshPokemonFormation(Pokemon_Formation_RefreshType.UpZhen,_itemData.dynamicId,upZhenIndex)
end
local newWarPower = 0
--飘战力
PokemonManager.PiaoWarPowerChange(oldWarPower,newWarPower)
end)
end
end)
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()

View File

@ -28,8 +28,8 @@ function this:OnShow(_parent,...)
parent=_parent
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
local _args = {...}
allProData=_args[1]
-- local _args = {...}
-- allProData=_args[1]
this.RefreshPanel()
end
@ -42,13 +42,19 @@ end
--刷新面板
function this.RefreshPanel()
for i, v in ipairs(allProData) do
allProData = {}
for i = 1, 4 do
allProData[i] = 0
end
local curallProData = PokemonManager.GetPokemonFormationAddPro()
HeroManager.DoubleTableCompound(allProData, curallProData)
for i = 1, #allProPre do
local go= allProPre[i]
if PropertyTypeIconDef[i] then
Util.GetGameObject(go, "Image"):GetComponent("Image").sprite = Util.LoadSprite(PropertyTypeIconDef[i])
end
Util.GetGameObject(go,"lv/proName"):GetComponent("Text").text="生命"
Util.GetGameObject(go,"lv/proValue"):GetComponent("Text").text= 1
Util.GetGameObject(go,"proName"):GetComponent("Text").text=ConfigManager.GetConfigData(ConfigName.PropertyConfig,i).Info
Util.GetGameObject(go,"proValue"):GetComponent("Text").text= allProData[i]
end
end

View File

@ -524,8 +524,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
elseif itemDataConFig.ItemType == ItemType.LingShou then
self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity))
self.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
self.fragmentIcon:SetActive(true)
self.fragmentIcon:GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[itemSId].PropertyName))
self.fragmentIcon:SetActive(false)
Util.AddOnceClick(self.frameBtn, function()
UIManager.OpenPanel(UIName.PokemonGetInfoPopup, false,itemSId)
end)