Merge branch 'china/dev-c' into 0优化/无尽副本
commit
c68da98b84
|
@ -895,7 +895,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -28.8}
|
||||
m_SizeDelta: {x: 810.6, y: 948.1}
|
||||
m_SizeDelta: {x: 900, y: 948.1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &691946464718676944
|
||||
GameObject:
|
||||
|
@ -2750,6 +2750,80 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &2095578116326476647
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1915557116560887742}
|
||||
- component: {fileID: 6724660429874909238}
|
||||
- component: {fileID: 908926187445182751}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1915557116560887742
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2095578116326476647}
|
||||
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: 1234173661531444072}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -503}
|
||||
m_SizeDelta: {x: 900, y: 6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6724660429874909238
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2095578116326476647}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &908926187445182751
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2095578116326476647}
|
||||
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: 21300000, guid: 26ce1a2f8851e004e88e569a15a5a1f8, type: 3}
|
||||
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 &2252907647811771510
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5721,7 +5795,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1297378177353145215}
|
||||
m_Father: {fileID: 1234173661531444072}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -6255,7 +6329,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 4124221650990893700}
|
||||
m_Father: {fileID: 1234173661531444072}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -8503,6 +8577,7 @@ RectTransform:
|
|||
- {fileID: 8369931834587041866}
|
||||
- {fileID: 1031297484074503371}
|
||||
- {fileID: 7656265836104597532}
|
||||
- {fileID: 1915557116560887742}
|
||||
- {fileID: 7223015060704331990}
|
||||
- {fileID: 6806249098429226119}
|
||||
- {fileID: 1309844718863455023}
|
||||
|
@ -9652,7 +9727,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 8229610283058382897}
|
||||
m_Father: {fileID: 1234173661531444072}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
|
@ -1649,7 +1649,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -107, y: -100}
|
||||
m_AnchoredPosition: {x: -107, y: -145}
|
||||
m_SizeDelta: {x: 129, y: 130}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5983553501615161877
|
||||
|
|
|
@ -1601,6 +1601,7 @@ HELP_TYPE = {
|
|||
ArenaGuess = 84,--竞技场竞猜界面
|
||||
XiangYaoDuoBao=85,--降妖夺宝
|
||||
TaSuiLingXiao = 90,--踏碎凌霄
|
||||
Practice = 91,--修行
|
||||
FightLevel = 92,--山河社稷图
|
||||
}
|
||||
|
||||
|
|
|
@ -77,7 +77,6 @@ HERO_LOCKSTATE_FIELD = protobuf.FieldDescriptor();
|
|||
HERO_JEWELS_FIELD = protobuf.FieldDescriptor();
|
||||
HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor();
|
||||
HERO_CHANGEID_FIELD = protobuf.FieldDescriptor();
|
||||
HERO_SEALIDLIST_FIELD = protobuf.FieldDescriptor();
|
||||
POKEMONINFO = protobuf.Descriptor();
|
||||
POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor();
|
||||
POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -442,6 +441,10 @@ EXPERTINFO_SEX_FIELD = protobuf.FieldDescriptor();
|
|||
SIGNININFO = protobuf.Descriptor();
|
||||
SIGNININFO_DAYS_FIELD = protobuf.FieldDescriptor();
|
||||
SIGNININFO_STATE_FIELD = protobuf.FieldDescriptor();
|
||||
PURPLESEALSHOWINFO = protobuf.Descriptor();
|
||||
PURPLESEALSHOWINFO_ID_FIELD = protobuf.FieldDescriptor();
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMSIMPLEINFO = protobuf.Descriptor();
|
||||
TEAMSIMPLEINFO_HEROID_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMSIMPLEINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -454,6 +457,7 @@ TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
|
|||
TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONEINFO = protobuf.Descriptor();
|
||||
TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -650,6 +654,9 @@ USERTITLEINFO_OVERTIME_FIELD = protobuf.FieldDescriptor();
|
|||
USERMOUNTINFO = protobuf.Descriptor();
|
||||
USERMOUNTINFO_MOUNTID_FIELD = protobuf.FieldDescriptor();
|
||||
USERMOUNTINFO_OVERTIME_FIELD = protobuf.FieldDescriptor();
|
||||
WELFAREREDPACKET = protobuf.Descriptor();
|
||||
WELFAREREDPACKET_ID_FIELD = protobuf.FieldDescriptor();
|
||||
WELFAREREDPACKET_NUM_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEPLAYERINFO = protobuf.Descriptor();
|
||||
HARDSTAGEPLAYERINFO_UID_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEPLAYERINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -758,8 +765,8 @@ PLAYER_EXP_FIELD.index = 3
|
|||
PLAYER_EXP_FIELD.label = 1
|
||||
PLAYER_EXP_FIELD.has_default_value = false
|
||||
PLAYER_EXP_FIELD.default_value = 0
|
||||
PLAYER_EXP_FIELD.type = 5
|
||||
PLAYER_EXP_FIELD.cpp_type = 1
|
||||
PLAYER_EXP_FIELD.type = 3
|
||||
PLAYER_EXP_FIELD.cpp_type = 2
|
||||
|
||||
PLAYER_VIPLEVEL_FIELD.name = "vipLevel"
|
||||
PLAYER_VIPLEVEL_FIELD.full_name = ".rpc.protocols.Player.vipLevel"
|
||||
|
@ -1393,21 +1400,11 @@ HERO_CHANGEID_FIELD.default_value = 0
|
|||
HERO_CHANGEID_FIELD.type = 5
|
||||
HERO_CHANGEID_FIELD.cpp_type = 1
|
||||
|
||||
HERO_SEALIDLIST_FIELD.name = "sealIdList"
|
||||
HERO_SEALIDLIST_FIELD.full_name = ".rpc.protocols.Hero.sealIdList"
|
||||
HERO_SEALIDLIST_FIELD.number = 17
|
||||
HERO_SEALIDLIST_FIELD.index = 15
|
||||
HERO_SEALIDLIST_FIELD.label = 3
|
||||
HERO_SEALIDLIST_FIELD.has_default_value = false
|
||||
HERO_SEALIDLIST_FIELD.default_value = {}
|
||||
HERO_SEALIDLIST_FIELD.type = 5
|
||||
HERO_SEALIDLIST_FIELD.cpp_type = 1
|
||||
|
||||
HERO.name = "Hero"
|
||||
HERO.full_name = ".rpc.protocols.Hero"
|
||||
HERO.nested_types = {}
|
||||
HERO.enum_types = {}
|
||||
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD, HERO_SEALIDLIST_FIELD}
|
||||
HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD}
|
||||
HERO.is_extendable = false
|
||||
HERO.extensions = {}
|
||||
POKEMONINFO_TEMPID_FIELD.name = "tempId"
|
||||
|
@ -4883,6 +4880,43 @@ SIGNININFO.enum_types = {}
|
|||
SIGNININFO.fields = {SIGNININFO_DAYS_FIELD, SIGNININFO_STATE_FIELD}
|
||||
SIGNININFO.is_extendable = false
|
||||
SIGNININFO.extensions = {}
|
||||
PURPLESEALSHOWINFO_ID_FIELD.name = "id"
|
||||
PURPLESEALSHOWINFO_ID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.id"
|
||||
PURPLESEALSHOWINFO_ID_FIELD.number = 1
|
||||
PURPLESEALSHOWINFO_ID_FIELD.index = 0
|
||||
PURPLESEALSHOWINFO_ID_FIELD.label = 1
|
||||
PURPLESEALSHOWINFO_ID_FIELD.has_default_value = false
|
||||
PURPLESEALSHOWINFO_ID_FIELD.default_value = 0
|
||||
PURPLESEALSHOWINFO_ID_FIELD.type = 5
|
||||
PURPLESEALSHOWINFO_ID_FIELD.cpp_type = 1
|
||||
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.name = "type"
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.type"
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.number = 2
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.index = 1
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.label = 1
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.has_default_value = false
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.default_value = 0
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.type = 5
|
||||
PURPLESEALSHOWINFO_TYPE_FIELD.cpp_type = 1
|
||||
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.name = "heroTId"
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.heroTId"
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.number = 3
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.index = 2
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.label = 1
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.has_default_value = false
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.default_value = 0
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.type = 5
|
||||
PURPLESEALSHOWINFO_HEROTID_FIELD.cpp_type = 1
|
||||
|
||||
PURPLESEALSHOWINFO.name = "PurpleSealShowInfo"
|
||||
PURPLESEALSHOWINFO.full_name = ".rpc.protocols.PurpleSealShowInfo"
|
||||
PURPLESEALSHOWINFO.nested_types = {}
|
||||
PURPLESEALSHOWINFO.enum_types = {}
|
||||
PURPLESEALSHOWINFO.fields = {PURPLESEALSHOWINFO_ID_FIELD, PURPLESEALSHOWINFO_TYPE_FIELD, PURPLESEALSHOWINFO_HEROTID_FIELD}
|
||||
PURPLESEALSHOWINFO.is_extendable = false
|
||||
PURPLESEALSHOWINFO.extensions = {}
|
||||
TEAMSIMPLEINFO_HEROID_FIELD.name = "heroid"
|
||||
TEAMSIMPLEINFO_HEROID_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.heroid"
|
||||
TEAMSIMPLEINFO_HEROID_FIELD.number = 1
|
||||
|
@ -4992,11 +5026,22 @@ TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {}
|
|||
TEAMONETEAMINFO_REMAINHP_FIELD.type = 3
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2
|
||||
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow"
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow"
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {}
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.message_type = PURPLESEALSHOWINFO
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.type = 11
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10
|
||||
|
||||
TEAMONETEAMINFO.name = "TeamOneTeamInfo"
|
||||
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
|
||||
TEAMONETEAMINFO.nested_types = {}
|
||||
TEAMONETEAMINFO.enum_types = {}
|
||||
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD}
|
||||
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD}
|
||||
TEAMONETEAMINFO.is_extendable = false
|
||||
TEAMONETEAMINFO.extensions = {}
|
||||
TEAMONEINFO_UID_FIELD.name = "uid"
|
||||
|
@ -6863,6 +6908,33 @@ USERMOUNTINFO.enum_types = {}
|
|||
USERMOUNTINFO.fields = {USERMOUNTINFO_MOUNTID_FIELD, USERMOUNTINFO_OVERTIME_FIELD}
|
||||
USERMOUNTINFO.is_extendable = false
|
||||
USERMOUNTINFO.extensions = {}
|
||||
WELFAREREDPACKET_ID_FIELD.name = "id"
|
||||
WELFAREREDPACKET_ID_FIELD.full_name = ".rpc.protocols.WelfareRedPacket.id"
|
||||
WELFAREREDPACKET_ID_FIELD.number = 1
|
||||
WELFAREREDPACKET_ID_FIELD.index = 0
|
||||
WELFAREREDPACKET_ID_FIELD.label = 1
|
||||
WELFAREREDPACKET_ID_FIELD.has_default_value = false
|
||||
WELFAREREDPACKET_ID_FIELD.default_value = 0
|
||||
WELFAREREDPACKET_ID_FIELD.type = 5
|
||||
WELFAREREDPACKET_ID_FIELD.cpp_type = 1
|
||||
|
||||
WELFAREREDPACKET_NUM_FIELD.name = "num"
|
||||
WELFAREREDPACKET_NUM_FIELD.full_name = ".rpc.protocols.WelfareRedPacket.num"
|
||||
WELFAREREDPACKET_NUM_FIELD.number = 2
|
||||
WELFAREREDPACKET_NUM_FIELD.index = 1
|
||||
WELFAREREDPACKET_NUM_FIELD.label = 1
|
||||
WELFAREREDPACKET_NUM_FIELD.has_default_value = false
|
||||
WELFAREREDPACKET_NUM_FIELD.default_value = 0
|
||||
WELFAREREDPACKET_NUM_FIELD.type = 5
|
||||
WELFAREREDPACKET_NUM_FIELD.cpp_type = 1
|
||||
|
||||
WELFAREREDPACKET.name = "WelfareRedPacket"
|
||||
WELFAREREDPACKET.full_name = ".rpc.protocols.WelfareRedPacket"
|
||||
WELFAREREDPACKET.nested_types = {}
|
||||
WELFAREREDPACKET.enum_types = {}
|
||||
WELFAREREDPACKET.fields = {WELFAREREDPACKET_ID_FIELD, WELFAREREDPACKET_NUM_FIELD}
|
||||
WELFAREREDPACKET.is_extendable = false
|
||||
WELFAREREDPACKET.extensions = {}
|
||||
HARDSTAGEPLAYERINFO_UID_FIELD.name = "uid"
|
||||
HARDSTAGEPLAYERINFO_UID_FIELD.full_name = ".rpc.protocols.HardStagePlayerInfo.uid"
|
||||
HARDSTAGEPLAYERINFO_UID_FIELD.number = 1
|
||||
|
@ -7255,6 +7327,7 @@ Pokemoncomonpent = protobuf.Message(POKEMONCOMONPENT)
|
|||
PosMineral = protobuf.Message(POSMINERAL)
|
||||
Privilege = protobuf.Message(PRIVILEGE)
|
||||
PurpleMansionSeal = protobuf.Message(PURPLEMANSIONSEAL)
|
||||
PurpleSealShowInfo = protobuf.Message(PURPLESEALSHOWINFO)
|
||||
QuestionOptions = protobuf.Message(QUESTIONOPTIONS)
|
||||
RankInfo = protobuf.Message(RANKINFO)
|
||||
RedOneDetail = protobuf.Message(REDONEDETAIL)
|
||||
|
@ -7290,6 +7363,7 @@ UserSkinInfo = protobuf.Message(USERSKININFO)
|
|||
UserTitleInfo = protobuf.Message(USERTITLEINFO)
|
||||
ViewHeroInfo = protobuf.Message(VIEWHEROINFO)
|
||||
VipBaseInfo = protobuf.Message(VIPBASEINFO)
|
||||
WelfareRedPacket = protobuf.Message(WELFAREREDPACKET)
|
||||
WorkShopBaseInfo = protobuf.Message(WORKSHOPBASEINFO)
|
||||
WorkShopUnLockInfo = protobuf.Message(WORKSHOPUNLOCKINFO)
|
||||
blessReward = protobuf.Message(BLESSREWARD)
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -66,6 +66,7 @@ GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD = protobuf.FieldDescriptor();
|
|||
GETPLAYERINFORESPONSE_USERSKINLIST_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_USERTITLELIST_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor();
|
||||
GETITEMINFOREQUEST = protobuf.Descriptor();
|
||||
|
@ -506,6 +507,12 @@ EQUIPUPLEVELRESPONSE_RESULT_FIELD = protobuf.FieldDescriptor();
|
|||
EQUIPUPLEVELRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
PUSHWELFARERESPONSE = protobuf.Descriptor();
|
||||
PUSHWELFARERESPONSE_ID_FIELD = protobuf.FieldDescriptor();
|
||||
WELFAREREDPACKETPUSH = protobuf.Descriptor();
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD = protobuf.FieldDescriptor();
|
||||
WELFAREREDPACKETSENDREQUEST = protobuf.Descriptor();
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
|
||||
WELFAREREDPACKETSENDRESPONSE = protobuf.Descriptor();
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD = protobuf.FieldDescriptor();
|
||||
HARDSTAGEREQUEST = protobuf.Descriptor();
|
||||
HARDSTAGERESPONSE = protobuf.Descriptor();
|
||||
HARDSTAGERESPONSE_INFO_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -1146,10 +1153,20 @@ GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.message_type = CommonProto_pb.USERMOUN
|
|||
GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.type = 11
|
||||
GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD.cpp_type = 10
|
||||
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.name = "dailyredpack"
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.dailyredpack"
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.number = 40
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.index = 39
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.label = 1
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.has_default_value = false
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.default_value = 0
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.type = 5
|
||||
GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD.cpp_type = 1
|
||||
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.name = "practiceLevel"
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.practiceLevel"
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.number = 40
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.index = 39
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.number = 41
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.index = 40
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.label = 1
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.has_default_value = false
|
||||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.default_value = 0
|
||||
|
@ -1158,8 +1175,8 @@ GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD.cpp_type = 1
|
|||
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.name = "sealList"
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.sealList"
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.number = 41
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.index = 40
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.number = 42
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.index = 41
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.label = 3
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.has_default_value = false
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD.default_value = {}
|
||||
|
@ -1171,7 +1188,7 @@ GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
|
|||
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
|
||||
GETPLAYERINFORESPONSE.nested_types = {}
|
||||
GETPLAYERINFORESPONSE.enum_types = {}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_ENDINFO_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD}
|
||||
GETPLAYERINFORESPONSE.is_extendable = false
|
||||
GETPLAYERINFORESPONSE.extensions = {}
|
||||
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
|
||||
|
@ -3530,8 +3547,8 @@ UPDATEUSEREXPINDICAITON_EXP_FIELD.index = 1
|
|||
UPDATEUSEREXPINDICAITON_EXP_FIELD.label = 1
|
||||
UPDATEUSEREXPINDICAITON_EXP_FIELD.has_default_value = false
|
||||
UPDATEUSEREXPINDICAITON_EXP_FIELD.default_value = 0
|
||||
UPDATEUSEREXPINDICAITON_EXP_FIELD.type = 5
|
||||
UPDATEUSEREXPINDICAITON_EXP_FIELD.cpp_type = 1
|
||||
UPDATEUSEREXPINDICAITON_EXP_FIELD.type = 3
|
||||
UPDATEUSEREXPINDICAITON_EXP_FIELD.cpp_type = 2
|
||||
|
||||
UPDATEUSEREXPINDICAITON.name = "UpdateUserExpIndicaiton"
|
||||
UPDATEUSEREXPINDICAITON.full_name = ".rpc.protocols.UpdateUserExpIndicaiton"
|
||||
|
@ -5152,6 +5169,59 @@ PUSHWELFARERESPONSE.enum_types = {}
|
|||
PUSHWELFARERESPONSE.fields = {PUSHWELFARERESPONSE_ID_FIELD}
|
||||
PUSHWELFARERESPONSE.is_extendable = false
|
||||
PUSHWELFARERESPONSE.extensions = {}
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.name = "redpacket"
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.full_name = ".rpc.protocols.WelfareRedPacketPush.redpacket"
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.number = 1
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.index = 0
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.label = 3
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.has_default_value = false
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.default_value = {}
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.message_type = CommonProto_pb.WELFAREREDPACKET
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.type = 11
|
||||
WELFAREREDPACKETPUSH_REDPACKET_FIELD.cpp_type = 10
|
||||
|
||||
WELFAREREDPACKETPUSH.name = "WelfareRedPacketPush"
|
||||
WELFAREREDPACKETPUSH.full_name = ".rpc.protocols.WelfareRedPacketPush"
|
||||
WELFAREREDPACKETPUSH.nested_types = {}
|
||||
WELFAREREDPACKETPUSH.enum_types = {}
|
||||
WELFAREREDPACKETPUSH.fields = {WELFAREREDPACKETPUSH_REDPACKET_FIELD}
|
||||
WELFAREREDPACKETPUSH.is_extendable = false
|
||||
WELFAREREDPACKETPUSH.extensions = {}
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.name = "id"
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.full_name = ".rpc.protocols.WelfareRedPacketSendRequest.id"
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.number = 1
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.index = 0
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.label = 1
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.has_default_value = false
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.default_value = 0
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.type = 5
|
||||
WELFAREREDPACKETSENDREQUEST_ID_FIELD.cpp_type = 1
|
||||
|
||||
WELFAREREDPACKETSENDREQUEST.name = "WelfareRedPacketSendRequest"
|
||||
WELFAREREDPACKETSENDREQUEST.full_name = ".rpc.protocols.WelfareRedPacketSendRequest"
|
||||
WELFAREREDPACKETSENDREQUEST.nested_types = {}
|
||||
WELFAREREDPACKETSENDREQUEST.enum_types = {}
|
||||
WELFAREREDPACKETSENDREQUEST.fields = {WELFAREREDPACKETSENDREQUEST_ID_FIELD}
|
||||
WELFAREREDPACKETSENDREQUEST.is_extendable = false
|
||||
WELFAREREDPACKETSENDREQUEST.extensions = {}
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.name = "redpacket"
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.full_name = ".rpc.protocols.WelfareRedPacketSendResponse.redpacket"
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.number = 1
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.index = 0
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.label = 3
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.has_default_value = false
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.default_value = {}
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.message_type = CommonProto_pb.WELFAREREDPACKET
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.type = 11
|
||||
WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD.cpp_type = 10
|
||||
|
||||
WELFAREREDPACKETSENDRESPONSE.name = "WelfareRedPacketSendResponse"
|
||||
WELFAREREDPACKETSENDRESPONSE.full_name = ".rpc.protocols.WelfareRedPacketSendResponse"
|
||||
WELFAREREDPACKETSENDRESPONSE.nested_types = {}
|
||||
WELFAREREDPACKETSENDRESPONSE.enum_types = {}
|
||||
WELFAREREDPACKETSENDRESPONSE.fields = {WELFAREREDPACKETSENDRESPONSE_REDPACKET_FIELD}
|
||||
WELFAREREDPACKETSENDRESPONSE.is_extendable = false
|
||||
WELFAREREDPACKETSENDRESPONSE.extensions = {}
|
||||
HARDSTAGEREQUEST.name = "HardStageRequest"
|
||||
HARDSTAGEREQUEST.full_name = ".rpc.protocols.HardStageRequest"
|
||||
HARDSTAGEREQUEST.nested_types = {}
|
||||
|
@ -5544,6 +5614,9 @@ VipTakeBoxRequest = protobuf.Message(VIPTAKEBOXREQUEST)
|
|||
VipTakeBoxResponse = protobuf.Message(VIPTAKEBOXRESPONSE)
|
||||
VipTakeDilyRequest = protobuf.Message(VIPTAKEDILYREQUEST)
|
||||
VipTakeDilyResponse = protobuf.Message(VIPTAKEDILYRESPONSE)
|
||||
WelfareRedPacketPush = protobuf.Message(WELFAREREDPACKETPUSH)
|
||||
WelfareRedPacketSendRequest = protobuf.Message(WELFAREREDPACKETSENDREQUEST)
|
||||
WelfareRedPacketSendResponse = protobuf.Message(WELFAREREDPACKETSENDRESPONSE)
|
||||
WorkShopEquipCreateRequest = protobuf.Message(WORKSHOPEQUIPCREATEREQUEST)
|
||||
WorkShopEquipCreateResponse = protobuf.Message(WORKSHOPEQUIPCREATERESPONSE)
|
||||
WorkShopFoundationRequest = protobuf.Message(WORKSHOPFOUNDATIONREQUEST)
|
||||
|
|
|
@ -21,7 +21,7 @@ function this:InitComponent(gameObject)
|
|||
local rootHight = self.scroll.transform.rect.height
|
||||
local width = self.scroll.transform.rect.width
|
||||
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scroll.transform,
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 4, Vector2.New(20, 35))
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 5, Vector2.New(20, 35))
|
||||
self.scrollView.moveTween.MomentumAmount = 1
|
||||
self.scrollView.moveTween.Strength = 2
|
||||
self.heroList={}
|
||||
|
@ -105,7 +105,7 @@ function this:ShowSingleData(go,heroData,index)
|
|||
self.maskList[index] = Util.GetGameObject(go, "choosed")
|
||||
-- LogGreen("data.UnlockId:"..tostring(data.UnlockId))
|
||||
self.maskList[index]:SetActive(tostring(PracticeManager.ImprintServerData[data.Id].subId) == tostring(heroData.dynamicId))
|
||||
SetHeroStars(starGrid, heroData.star)
|
||||
SetHeroStars(self.spLoader,starGrid, heroData.star)
|
||||
|
||||
Util.AddOnceClick(go, function()
|
||||
-- LogGreen("subId:"..tostring(PracticeManager.ImprintServerData[data.Id].subId).." did:"..tostring(heroData.dynamicId))
|
||||
|
|
|
@ -4,6 +4,7 @@ local sortingOrder=0
|
|||
local packageConfig=nil
|
||||
|
||||
function this:InitComponent(gameObject)
|
||||
this.spLoader = SpriteLoader.New()
|
||||
this.itemPre=Util.GetGameObject(gameObject,"Item")
|
||||
this.scrollRoot=Util.GetGameObject(gameObject,"scrollRect")
|
||||
this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scrollRoot.transform,this.itemPre, nil,
|
||||
|
@ -52,7 +53,7 @@ function this:OnClose()
|
|||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
|
||||
this.spLoader:Destroy()
|
||||
end
|
||||
|
||||
---初始化面板
|
||||
|
@ -100,8 +101,8 @@ function this:ShowItemInfo(go,data)
|
|||
local numTxt=Util.GetGameObject(go,"numTxt"):GetComponent("Text")
|
||||
local btn_send=Util.GetGameObject(go,"btn_send")
|
||||
local sendTxt=Util.GetGameObject(go,"btn_send/Text"):GetComponent("Text")
|
||||
nameImage.sprite=Util.LoadSprite("g_ghhb_ming_04_zh")
|
||||
icon.sprite=Util.LoadSprite(GetResourcePath(data.config.IconId))
|
||||
nameImage.sprite=this.spLoader:LoadSprite("g_ghhb_ming_04_zh")
|
||||
icon.sprite=this.spLoader:LoadSprite(GetResourcePath(data.config.IconId))
|
||||
desTxt.text= data.config.RuleDes
|
||||
local num=data.num
|
||||
numTxt.text="数量:"..data.num
|
||||
|
@ -145,7 +146,7 @@ function this:ShowItemInfo(go,data)
|
|||
this.infoObj.gameObject:SetActive(true)
|
||||
this.numTxt.text=data.config.TotalMoney[1]
|
||||
this.sumTxt.text=data.config.TotalMoney[2]
|
||||
this.rewardImg.sprite=Util.LoadSprite(GetResourcePath(data.config.IconId))
|
||||
this.rewardImg.sprite=this.spLoader:LoadSprite(GetResourcePath(data.config.IconId))
|
||||
end)
|
||||
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ end
|
|||
--界面销毁时调用(用于子类重写)
|
||||
function NoticePopup:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
|
||||
prelist = {}
|
||||
end
|
||||
|
||||
function this.GetNotice(str)
|
||||
|
@ -71,6 +71,7 @@ function this.GetNotice(str)
|
|||
-- value.content="一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。"
|
||||
-- LogError("title:"..value.title.." content:"..value.content.." type:"..value.type)
|
||||
-- end
|
||||
this.TitleText.text=Language[11147]
|
||||
if data.list and #data.list>0 then
|
||||
this.ContentText.gameObject:SetActive(false)
|
||||
table.sort(data.list, function(a, b)
|
||||
|
@ -99,9 +100,15 @@ function this.GetNotice(str)
|
|||
elseif value.type==4 then
|
||||
img.gameObject:SetActive(false)
|
||||
end
|
||||
Util.GetGameObject(prelist[key],"Image/title"):GetComponent("Text").text=value.title
|
||||
-- 表体
|
||||
local title = Util.GetGameObject(prelist[key],"Image/title"):GetComponent("Text")
|
||||
local titleStr = string.split(value.title,"|")
|
||||
title.text = titleStr[GetCurLanguage()+1] or titleStr[1]
|
||||
-- 内容
|
||||
local content=Util.GetGameObject(prelist[key],"content"):GetComponent("Text")
|
||||
content.text=value.content
|
||||
local contentStr = string.split(string.gsub(value.content, "\\n", "\n"),"|")
|
||||
content.text = contentStr[GetCurLanguage()+1] or contentStr[1]
|
||||
|
||||
local down=Util.GetGameObject(prelist[key],"Image/down")
|
||||
local left=Util.GetGameObject(prelist[key],"Image/left")
|
||||
local isOpen=true
|
||||
|
@ -109,12 +116,12 @@ function this.GetNotice(str)
|
|||
left:SetActive(not isOpen)
|
||||
content.gameObject:SetActive(isOpen)
|
||||
local btn=Util.GetGameObject(prelist[key],"Image")
|
||||
Util.AddClick(btn,function()
|
||||
isOpen=not isOpen
|
||||
down:SetActive(isOpen)
|
||||
left:SetActive(not isOpen)
|
||||
content.gameObject:SetActive(isOpen)
|
||||
end)
|
||||
Util.AddClick(btn,function()
|
||||
isOpen=not isOpen
|
||||
down:SetActive(isOpen)
|
||||
left:SetActive(not isOpen)
|
||||
content.gameObject:SetActive(isOpen)
|
||||
end)
|
||||
end
|
||||
-- local titleStr = string.split(data.parms.title,"|")
|
||||
-- this.TitleText.text =titleStr[GetCurLanguage()+1] or titleStr[1]
|
||||
|
@ -122,7 +129,6 @@ function this.GetNotice(str)
|
|||
-- this.ContentText.text = contentStr[GetCurLanguage()+1] or contentStr[1]
|
||||
else
|
||||
this.ContentText.gameObject:SetActive(true)
|
||||
this.TitleText.text=Language[11147]
|
||||
this.ContentText.text=Language[11148]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -921,12 +921,22 @@ function this.CheckScreenRightRedPoint()
|
|||
if not this.btnPokemon then
|
||||
return
|
||||
end
|
||||
if not this.btnColorfulWorld then
|
||||
return
|
||||
end
|
||||
if not this.btnPokemon.gameObject then
|
||||
return
|
||||
end
|
||||
if not this.btnColorfulWorld.gameObject then
|
||||
return
|
||||
end
|
||||
if not this.btnPokemon.gameObject.transform then
|
||||
return
|
||||
end
|
||||
|
||||
if not this.btnColorfulWorld.gameObject.transform then
|
||||
return
|
||||
end
|
||||
end
|
||||
pos1=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnPokemon.transform.position)
|
||||
pos2=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnColorfulWorld.transform.position)
|
||||
if (pos1.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.PokemonMainCity)==RedPointStatus.Show) or (pos2.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.Vientiane)==RedPointStatus.Show) then
|
||||
|
|
|
@ -17,7 +17,7 @@ function this.RegisterMessage(network)
|
|||
--监听红点推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.SEND_RED_POINT_INDICATION, this.ReceiveRedPoint)
|
||||
--福利红包推送
|
||||
-- socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.UPDATE_BAG_INDICATION, this.BackUpDataBagItemIdNumber)
|
||||
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.SEND_CHAT_INFO_INDICATION, this.ReceiveFriendChat)
|
||||
|
|
|
@ -335,27 +335,29 @@ function this.PracticeCheckUpgrade()
|
|||
for i = 1, #configData.LevelUpCost do
|
||||
local data = configData.LevelUpCost[i]
|
||||
if BagManager.GetTotalItemNum(data[1]) < data[2] then
|
||||
LogRed("return false Upgrade 1")
|
||||
-- LogRed("return false Upgrade 1")
|
||||
return false
|
||||
end
|
||||
end
|
||||
LogGreen("return true Upgrade")
|
||||
-- LogGreen("return true Upgrade")
|
||||
return true
|
||||
end
|
||||
LogRed("return false Upgrade 2")
|
||||
-- LogRed("return false Upgrade 2")
|
||||
return false
|
||||
end
|
||||
|
||||
--神印红点检测
|
||||
function this.PracticeCheckImprint()
|
||||
for i, v in ConfigPairs(XiuXianSkillConfig) do
|
||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."Imprint"..v.Id)
|
||||
if str == 0 then
|
||||
LogGreen("return true Imprint")
|
||||
return true
|
||||
if this.ImprintServerData[v.Id] then
|
||||
local str = PlayerPrefs.GetInt(PlayerManager.uid.."Imprint"..v.Id)
|
||||
if str == 0 then
|
||||
-- LogGreen("return true Imprint")
|
||||
return true
|
||||
end
|
||||
end
|
||||
end
|
||||
LogRed("return false Imprint")
|
||||
-- LogRed("return false Imprint")
|
||||
return false
|
||||
end
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ end
|
|||
function Practice:BindEvent()
|
||||
--帮助按钮
|
||||
Util.AddClick(self.helpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.VIP, self.helpPosition.x,self.helpPosition.y)
|
||||
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Practice, self.helpPosition.x,self.helpPosition.y)
|
||||
end)
|
||||
|
||||
Util.AddClick(self.BtnBack, function()
|
||||
|
@ -63,13 +63,17 @@ function Practice:BindEvent()
|
|||
UIManager.OpenPanel(UIName.RoleProInfoPopup,PracticeManager.GetCurAllGetAddForShow(),nil,false,nil)
|
||||
end)
|
||||
Util.AddClick(self.imprintBtn, function()
|
||||
UIManager.OpenPanel(UIName.PracticeImprintPanel)
|
||||
if PracticeManager.PracticeBigLevel > 1 then
|
||||
UIManager.OpenPanel(UIName.PracticeImprintPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip("到达筑基期后解锁!")
|
||||
end
|
||||
end)
|
||||
Util.AddClick(self.textBtn, function()
|
||||
LogGreen("打开山河社稷图")
|
||||
Log("打开山河社稷图")
|
||||
end)
|
||||
Util.AddClick(self.starBtn, function()
|
||||
LogGreen("打开山河社稷图")
|
||||
UIManager.OpenPanel(UIName.FightLevelChapterPanel)
|
||||
end)
|
||||
Util.AddClick(self.button, function()
|
||||
if self:UpgradeCheck() then return end
|
||||
|
@ -130,7 +134,8 @@ end
|
|||
|
||||
function Practice:OnShow()
|
||||
self.playerInfoView:OnShow()
|
||||
-- CheckRedPointStatus(RedPointType.Practice)
|
||||
CheckRedPointStatus(RedPointType.Practice_imprint)
|
||||
CheckRedPointStatus(RedPointType.Practice_upgrade)
|
||||
FormationManager.RefreshMainFormationPower()
|
||||
self.curLevelConfig = PracticeManager.GetCurConfigData()
|
||||
LogYellow("当前修行等级Id:"..tostring(PracticeManager.PracticeLevel))
|
||||
|
@ -201,6 +206,8 @@ function Practice:RefreshLines()
|
|||
end
|
||||
|
||||
function Practice:RefreshBtn()
|
||||
--神印按钮筑基期后开启
|
||||
Util.SetGray(self.imprintBtn,PracticeManager.PracticeBigLevel < 2)
|
||||
if XinXianConfig[PracticeManager.PracticeLevel + 1] then
|
||||
self.button:SetActive(true)
|
||||
if self.curLevelConfig.LevelUpCost then--如果下级消耗不为空则为突破阶段
|
||||
|
|
Loading…
Reference in New Issue