From 0b747a5179c664f736e6a310924b86b6015a506a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 22 Jul 2020 19:40:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E7=8C=9C=E5=B8=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Message/ArenaInfoProto_pb.lua | 13 +++- .../~Lua/Message/Family_pb.lua | 13 +++- .../~Lua/Message/MapInfoProto_pb.lua | 13 +++- .../~Lua/Message/PlayerInfoProto_pb.lua | 61 ++++++++++++++++++- .../ArenaTopMatch/ArenaTopMatchManager.lua | 37 ++++++++--- .../Modules/ArenaTopMatch/DoGuessPopup.lua | 2 +- .../ArenaTopMatch/View/ATM_GuessTipView.lua | 28 ++++----- .../ArenaTopMatch/View/ATM_GuessView.lua | 11 ++-- .../ArenaTopMatch/View/ATM_MainMatchView.lua | 5 +- 9 files changed, 142 insertions(+), 41 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua index 9fc4436283..b6d7250d07 100644 --- a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua @@ -51,6 +51,7 @@ CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETBETRESPONSE_WINUID_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETBETRESPONSE_PROCESS_FIELD = protobuf.FieldDescriptor(); +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD = protobuf.FieldDescriptor(); CHAMPIONBETREQEUST = protobuf.Descriptor(); CHAMPIONBETREQEUST_WINUID_FIELD = protobuf.FieldDescriptor(); CHAMPIONBETREQEUST_COINS_FIELD = protobuf.FieldDescriptor(); @@ -523,11 +524,21 @@ CHAMPIONGETBETRESPONSE_PROCESS_FIELD.default_value = 0 CHAMPIONGETBETRESPONSE_PROCESS_FIELD.type = 5 CHAMPIONGETBETRESPONSE_PROCESS_FIELD.cpp_type = 1 +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.name = "myBetCoins" +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetBetResponse.myBetCoins" +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.number = 5 +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.index = 4 +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.label = 1 +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.has_default_value = false +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.default_value = 0 +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.type = 5 +CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD.cpp_type = 1 + CHAMPIONGETBETRESPONSE.name = "ChampionGetBetResponse" CHAMPIONGETBETRESPONSE.full_name = ".com.ljsd.jieling.protocols.ChampionGetBetResponse" CHAMPIONGETBETRESPONSE.nested_types = {} CHAMPIONGETBETRESPONSE.enum_types = {} -CHAMPIONGETBETRESPONSE.fields = {CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD, CHAMPIONGETBETRESPONSE_WINUID_FIELD, CHAMPIONGETBETRESPONSE_PROCESS_FIELD} +CHAMPIONGETBETRESPONSE.fields = {CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD, CHAMPIONGETBETRESPONSE_WINUID_FIELD, CHAMPIONGETBETRESPONSE_PROCESS_FIELD, CHAMPIONGETBETRESPONSE_MYBETCOINS_FIELD} CHAMPIONGETBETRESPONSE.is_extendable = false CHAMPIONGETBETRESPONSE.extensions = {} CHAMPIONBETREQEUST_WINUID_FIELD.name = "winUid" diff --git a/Assets/ManagedResources/~Lua/Message/Family_pb.lua b/Assets/ManagedResources/~Lua/Message/Family_pb.lua index a5596e1e06..6ce06e087c 100644 --- a/Assets/ManagedResources/~Lua/Message/Family_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Family_pb.lua @@ -262,6 +262,7 @@ DEATHPATHINFO_GUILDNAME_FIELD = protobuf.FieldDescriptor(); DEATHPATHINFO_GID_FIELD = protobuf.FieldDescriptor(); GETDEATHPATHSTATUSRESPONSE = protobuf.Descriptor(); GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD = protobuf.FieldDescriptor(); +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD = protobuf.FieldDescriptor(); GETDEATHPATHINFORESPONSE = protobuf.Descriptor(); GETDEATHPATHINFORESPONSE_OVERTIME_FIELD = protobuf.FieldDescriptor(); GETDEATHPATHINFORESPONSE_CHALLENGECOUNT_FIELD = protobuf.FieldDescriptor(); @@ -2713,11 +2714,21 @@ GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD.default_value = 0 GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD.type = 5 GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD.cpp_type = 1 +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.name = "allowChallange" +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.full_name = ".com.ljsd.jieling.protocols.GetDeathPathStatusResponse.allowChallange" +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.number = 2 +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.index = 1 +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.label = 1 +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.has_default_value = false +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.default_value = 0 +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.type = 5 +GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD.cpp_type = 1 + GETDEATHPATHSTATUSRESPONSE.name = "GetDeathPathStatusResponse" GETDEATHPATHSTATUSRESPONSE.full_name = ".com.ljsd.jieling.protocols.GetDeathPathStatusResponse" GETDEATHPATHSTATUSRESPONSE.nested_types = {} GETDEATHPATHSTATUSRESPONSE.enum_types = {} -GETDEATHPATHSTATUSRESPONSE.fields = {GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD} +GETDEATHPATHSTATUSRESPONSE.fields = {GETDEATHPATHSTATUSRESPONSE_STATUS_FIELD, GETDEATHPATHSTATUSRESPONSE_ALLOWCHALLANGE_FIELD} GETDEATHPATHSTATUSRESPONSE.is_extendable = false GETDEATHPATHSTATUSRESPONSE.extensions = {} GETDEATHPATHINFORESPONSE_OVERTIME_FIELD.name = "overTime" diff --git a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua index cc4acbc7a2..079d950948 100644 --- a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua @@ -84,6 +84,7 @@ TOWERCOPYINFO_MAPINTORESET_FIELD = protobuf.FieldDescriptor(); TOWERCOPYINFO_TOWERUSETIME_FIELD = protobuf.FieldDescriptor(); TOWERCOPYINFO_TRIALREWARDINFO_FIELD = protobuf.FieldDescriptor(); TOWERCOPYINFO_KILLCOUNT_FIELD = protobuf.FieldDescriptor(); +TOWERCOPYINFO_BOMBUSED_FIELD = protobuf.FieldDescriptor(); GETALLLEVELDIFFICULTYINFOSRESPONSE = protobuf.Descriptor(); GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD = protobuf.FieldDescriptor(); GETALLLEVELDIFFICULTYINFOSRESPONSE_MAPINFOS_FIELD = protobuf.FieldDescriptor(); @@ -936,11 +937,21 @@ TOWERCOPYINFO_KILLCOUNT_FIELD.default_value = 0 TOWERCOPYINFO_KILLCOUNT_FIELD.type = 5 TOWERCOPYINFO_KILLCOUNT_FIELD.cpp_type = 1 +TOWERCOPYINFO_BOMBUSED_FIELD.name = "bombUsed" +TOWERCOPYINFO_BOMBUSED_FIELD.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo.bombUsed" +TOWERCOPYINFO_BOMBUSED_FIELD.number = 9 +TOWERCOPYINFO_BOMBUSED_FIELD.index = 8 +TOWERCOPYINFO_BOMBUSED_FIELD.label = 1 +TOWERCOPYINFO_BOMBUSED_FIELD.has_default_value = false +TOWERCOPYINFO_BOMBUSED_FIELD.default_value = 0 +TOWERCOPYINFO_BOMBUSED_FIELD.type = 5 +TOWERCOPYINFO_BOMBUSED_FIELD.cpp_type = 1 + TOWERCOPYINFO.name = "TowerCopyInfo" TOWERCOPYINFO.full_name = ".com.ljsd.jieling.protocols.TowerCopyInfo" TOWERCOPYINFO.nested_types = {} TOWERCOPYINFO.enum_types = {} -TOWERCOPYINFO.fields = {TOWERCOPYINFO_TOWER_FIELD, TOWERCOPYINFO_FIGHTCOUNT_FIELD, TOWERCOPYINFO_HIGHESTTOWER_FIELD, TOWERCOPYINFO_ESSENCEVALUE_FIELD, TOWERCOPYINFO_MAPINTORESET_FIELD, TOWERCOPYINFO_TOWERUSETIME_FIELD, TOWERCOPYINFO_TRIALREWARDINFO_FIELD, TOWERCOPYINFO_KILLCOUNT_FIELD} +TOWERCOPYINFO.fields = {TOWERCOPYINFO_TOWER_FIELD, TOWERCOPYINFO_FIGHTCOUNT_FIELD, TOWERCOPYINFO_HIGHESTTOWER_FIELD, TOWERCOPYINFO_ESSENCEVALUE_FIELD, TOWERCOPYINFO_MAPINTORESET_FIELD, TOWERCOPYINFO_TOWERUSETIME_FIELD, TOWERCOPYINFO_TRIALREWARDINFO_FIELD, TOWERCOPYINFO_KILLCOUNT_FIELD, TOWERCOPYINFO_BOMBUSED_FIELD} TOWERCOPYINFO.is_extendable = false TOWERCOPYINFO.extensions = {} GETALLLEVELDIFFICULTYINFOSRESPONSE_LEVELDIFFICULTYINFOS_FIELD.name = "levelDifficultyInfos" diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua index c3316ad396..accd7828d7 100644 --- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua @@ -19,6 +19,7 @@ LOGINREQUEST_IP_S_FIELD = protobuf.FieldDescriptor(); LOGINREQUEST_OPENID_FIELD = protobuf.FieldDescriptor(); LOGINREQUEST_CHANNEL_S_FIELD = protobuf.FieldDescriptor(); LOGINREQUEST_PLATFORM_S_FIELD = protobuf.FieldDescriptor(); +LOGINREQUEST_DISTINCT_ID_FIELD = protobuf.FieldDescriptor(); LOGINRESPONSE = protobuf.Descriptor(); LOGINRESPONSE_RESULTCODE_FIELD = protobuf.FieldDescriptor(); LOGINRESPONSE_NEWTOKEN_FIELD = protobuf.FieldDescriptor(); @@ -57,6 +58,8 @@ GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_MONTHINFOS_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor(); +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD = protobuf.FieldDescriptor(); +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor(); GETITEMINFOREQUEST = protobuf.Descriptor(); GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor(); GETITEMINFORESPONSE = protobuf.Descriptor(); @@ -237,6 +240,8 @@ FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD = protobuf.FieldDescriptor(); FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD = protobuf.FieldDescriptor(); FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD = protobuf.FieldDescriptor(); FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD = protobuf.FieldDescriptor(); +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD = protobuf.FieldDescriptor(); +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD = protobuf.FieldDescriptor(); GETMISSIONRESPONSE = protobuf.Descriptor(); GETMISSIONRESPONSE_USERMISSIONINFO_FIELD = protobuf.FieldDescriptor(); REFRESHITEMNUMREQUEST = protobuf.Descriptor(); @@ -580,11 +585,21 @@ LOGINREQUEST_PLATFORM_S_FIELD.default_value = "" LOGINREQUEST_PLATFORM_S_FIELD.type = 9 LOGINREQUEST_PLATFORM_S_FIELD.cpp_type = 9 +LOGINREQUEST_DISTINCT_ID_FIELD.name = "distinct_id" +LOGINREQUEST_DISTINCT_ID_FIELD.full_name = ".com.ljsd.jieling.protocols.LoginRequest.distinct_id" +LOGINREQUEST_DISTINCT_ID_FIELD.number = 13 +LOGINREQUEST_DISTINCT_ID_FIELD.index = 12 +LOGINREQUEST_DISTINCT_ID_FIELD.label = 1 +LOGINREQUEST_DISTINCT_ID_FIELD.has_default_value = false +LOGINREQUEST_DISTINCT_ID_FIELD.default_value = "" +LOGINREQUEST_DISTINCT_ID_FIELD.type = 9 +LOGINREQUEST_DISTINCT_ID_FIELD.cpp_type = 9 + LOGINREQUEST.name = "LoginRequest" LOGINREQUEST.full_name = ".com.ljsd.jieling.protocols.LoginRequest" LOGINREQUEST.nested_types = {} LOGINREQUEST.enum_types = {} -LOGINREQUEST.fields = {LOGINREQUEST_DEVICE_ID_S_FIELD, LOGINREQUEST_IDFA_SOR_IMEI_S_FIELD, LOGINREQUEST_BRAND_TYPE_S_FIELD, LOGINREQUEST_BRAND_S_FIELD, LOGINREQUEST_OS_VERSION_S_FIELD, LOGINREQUEST_DPI_S_FIELD, LOGINREQUEST_OPERATOR_S_FIELD, LOGINREQUEST_NETWORK_S_FIELD, LOGINREQUEST_IP_S_FIELD, LOGINREQUEST_OPENID_FIELD, LOGINREQUEST_CHANNEL_S_FIELD, LOGINREQUEST_PLATFORM_S_FIELD} +LOGINREQUEST.fields = {LOGINREQUEST_DEVICE_ID_S_FIELD, LOGINREQUEST_IDFA_SOR_IMEI_S_FIELD, LOGINREQUEST_BRAND_TYPE_S_FIELD, LOGINREQUEST_BRAND_S_FIELD, LOGINREQUEST_OS_VERSION_S_FIELD, LOGINREQUEST_DPI_S_FIELD, LOGINREQUEST_OPERATOR_S_FIELD, LOGINREQUEST_NETWORK_S_FIELD, LOGINREQUEST_IP_S_FIELD, LOGINREQUEST_OPENID_FIELD, LOGINREQUEST_CHANNEL_S_FIELD, LOGINREQUEST_PLATFORM_S_FIELD, LOGINREQUEST_DISTINCT_ID_FIELD} LOGINREQUEST.is_extendable = false LOGINREQUEST.extensions = {} LOGINRESPONSE_RESULTCODE_FIELD.name = "resultCode" @@ -962,11 +977,31 @@ GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.default_value = 0 GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.type = 5 GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD.cpp_type = 1 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.name = "hadLuckTime" +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse.hadLuckTime" +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.number = 32 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.index = 31 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.label = 1 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.has_default_value = false +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.default_value = 0 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.type = 5 +GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD.cpp_type = 1 + +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.name = "hadAdvanceLuckTime" +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.GetPlayerInfoResponse.hadAdvanceLuckTime" +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.number = 33 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.index = 32 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.label = 1 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.has_default_value = false +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.default_value = 0 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.type = 5 +GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD.cpp_type = 1 + GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse" GETPLAYERINFORESPONSE.full_name = ".com.ljsd.jieling.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.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.is_extendable = false GETPLAYERINFORESPONSE.extensions = {} GETITEMINFOREQUEST_INDEX_FIELD.name = "index" @@ -2610,11 +2645,31 @@ FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.default_value = 0 FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.type = 5 FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD.cpp_type = 1 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.name = "hadLuckTime" +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication.hadLuckTime" +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.number = 14 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.index = 13 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.label = 1 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.has_default_value = false +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.default_value = 0 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.type = 5 +FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD.cpp_type = 1 + +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.name = "hadAdvanceLuckTime" +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication.hadAdvanceLuckTime" +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.number = 15 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.index = 14 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.label = 1 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.has_default_value = false +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.default_value = 0 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.type = 5 +FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD.cpp_type = 1 + FIVEPLAYERUPDATEINDICATION.name = "FivePlayerUpdateIndication" FIVEPLAYERUPDATEINDICATION.full_name = ".com.ljsd.jieling.protocols.FivePlayerUpdateIndication" FIVEPLAYERUPDATEINDICATION.nested_types = {} FIVEPLAYERUPDATEINDICATION.enum_types = {} -FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD} +FIVEPLAYERUPDATEINDICATION.fields = {FIVEPLAYERUPDATEINDICATION_HADTAKEDAILYBOX_FIELD, FIVEPLAYERUPDATEINDICATION_PRIVILEGE_FIELD, FIVEPLAYERUPDATEINDICATION_ACTIVITYINFO_FIELD, FIVEPLAYERUPDATEINDICATION_USERMISSIONINFO_FIELD, FIVEPLAYERUPDATEINDICATION_FIVERESETTOWERINFO_FIELD, FIVEPLAYERUPDATEINDICATION_SIGNININFO_FIELD, FIVEPLAYERUPDATEINDICATION_PLAYERBINDPHONE_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOS_FIELD, FIVEPLAYERUPDATEINDICATION_POSINFOSADVANCE_FIELD, FIVEPLAYERUPDATEINDICATION_MONTHDAILYTAKE_FIELD, FIVEPLAYERUPDATEINDICATION_LASTFETETYPE_FIELD, FIVEPLAYERUPDATEINDICATION_TAKEFETEREWARD_FIELD, FIVEPLAYERUPDATEINDICATION_EXPEDITIONLEVE_FIELD, FIVEPLAYERUPDATEINDICATION_HADLUCKTIME_FIELD, FIVEPLAYERUPDATEINDICATION_HADADVANCELUCKTIME_FIELD} FIVEPLAYERUPDATEINDICATION.is_extendable = false FIVEPLAYERUPDATEINDICATION.extensions = {} GETMISSIONRESPONSE_USERMISSIONINFO_FIELD.name = "userMissionInfo" diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index 180e9fa8fc..bb7d86cabe 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -2,6 +2,7 @@ local this = ArenaTopMatchManager this.CurTabIndex = 0 this.curIsShowDoGuessPopup = false +local isChange = false local stageNameTable = { [1] = 32 .. Language[10097],--强 [2] = 16 .. Language[10097],--强 @@ -25,6 +26,7 @@ function this.Initialize() this.betBattleInfo = {} this.betRateInfo = {} this.myBetTarget = nil + this.myBetCoins = 0 this.process = nil this.betHistoryInfo = {} this.coinNum=0 --竞猜币临时数据 @@ -87,6 +89,7 @@ function this.RequestTopMatchBaseInfo(func) this.baseInfo.loser = msg.loser--是否被淘汰 this.myBattleInfo = msg.championBattleInfo + isChange = false this.RefreshBaseInfo() -- 发送更新事件 Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnTopMatchDataUpdate) @@ -255,9 +258,11 @@ function this.RequestBetBaseInfo(func,isPlayBattle) -- 获取巅峰战信息 NetManager.GetBetMatchInfo(0, function(msg) this.betBattleInfo = msg.championBattleInfo + isChange = false LogGreen("竞猜双方uid "..msg.championBattleInfo.myInfo.uid.." "..msg.championBattleInfo.enemyInfo.uid) this.betRateInfo = msg.championBetInfo this.myBetTarget = msg.winUid + this.myBetCoins = msg.myBetCoins LogGreen("this.myBetTarget = msg.winUid "..this.myBetTarget.." "..msg.winUid) this.process = msg.process LogGreen("竞猜msg.process "..msg.process) @@ -271,8 +276,11 @@ function this.RequestBetBaseInfo(func,isPlayBattle) LogGreen("this.baseInfo.battleState "..this.baseInfo.battleState) if this.baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END and isPlayBattle then LogGreen("this.baseInfo.battleState "..this.baseInfo.battleState) - --推送信息的时候判断是否需要播放动画 - Game.GlobalEvent:DispatchEvent(GameEvent.ATM_RankView.OnOpenBattle) + --当历史战斗记录以决出胜负 说明此时是第三场 不需要自动播放战斗动画 + if not ArenaTopMatchManager.GetIsBattleEndState(this.CurTabIndex) then + --推送信息的not时候判断是否需要播放动画 + Game.GlobalEvent:DispatchEvent(GameEvent.ATM_RankView.OnOpenBattle) + end end if func then func() end end) @@ -379,6 +387,10 @@ end function this.GetMyBetTarget() return this.myBetTarget end +--- 获取我下注的竞猜币数量 +function this.GetMyBetCoins() + return this.myBetCoins +end --- 获取竞猜三局两胜数据 function this.GetProcess() return this.process @@ -429,6 +441,9 @@ function this.Request_4_EliminationData(func) NetManager.GetTopMatchEliminationInfo(2, function(msg) -- this.EliminationData_4 = msg.championBattlePairInfo LogPink("获取4强数据成功, 数据长度 = "..#msg.championBattlePairInfo) + for i = 1, #msg.championBattlePairInfo do + LogPink("roundTImes "..msg.championBattlePairInfo[i].roundTImes.." .teamId "..msg.championBattlePairInfo[i].teamId.." .position ".. msg.championBattlePairInfo[i].position) + end this.EliminationData_4 = this.RequestEliminationDataMerge(msg.championBattlePairInfo) LogPink("获取4强数据成功, 数据长度 = "..#this.EliminationData_4) if func then func() end @@ -768,7 +783,7 @@ function this.RequestRankData(page,func) local length=#this.rankData for i, v in ipairs(msg.rankInfos) do if v.personInfo.rank<=8 then - LogGreen("前八名数据 "..length+i) + LogGreen("前八名数据 "..length+i.." uid "..v.personInfo.uid) this.rankData[length+i]=v.personInfo end end @@ -921,7 +936,7 @@ function this.GetIsBattleEndState(type) -- 没开启或者开启没参赛都属于未参赛 local isJoin = baseData.joinState == 1 local isOver = baseData.progress == -2 - if oldTwoOutOfThreeIndex == 0 or oldTwoOutOfThreeIndex == 1 and isJoin and not isOver then + if (oldTwoOutOfThreeIndex == 0 or oldTwoOutOfThreeIndex == 1) and isJoin and not isOver then return true else return false @@ -947,13 +962,13 @@ local old_baseInfo_battleState = 0--状态 准备 还是 战斗 local old_baseInfo_endTime = 0--倒计时时间戳 local old_myBattleInfo_result = 0--我的当前战斗结果 local old_betBattleInfo_result = 0--竞猜当前战斗结果 -local isChange = false --当第三场不需要时 需要先端自己改变数据 function this.ChangeData(type) + if true then return end if not type then return end local isJoin = this.baseInfo.joinState == 1 local isOver = this.baseInfo.progress == -2 - if not isJoin or isOver or this.baseInfo.battleStage ~= TOP_MATCH_STAGE.ELIMINATION then return end + if not isJoin or isOver or this.baseInfo.battleStage ~= TOP_MATCH_STAGE.ELIMINATION or this.baseInfo.loser then return end local oldTwoOutOfThreeIndex = nil---历史记录(上次的结果 当前胜负根据战斗结果判断) -1 无记录 0前两场负 1 前两场胜 2 胜 3 负 4 胜负 5 负胜 if type == 1 then--我的 oldTwoOutOfThreeIndex = this.baseInfo.process @@ -961,6 +976,7 @@ function this.ChangeData(type) oldTwoOutOfThreeIndex = this.GetProcess() end if oldTwoOutOfThreeIndex == 0 or oldTwoOutOfThreeIndex == 1 then + LogPink("isChange "..tostring(isChange)) if not isChange then old_baseInfo_battleState = this.baseInfo.battleState old_baseInfo_endTime = this.baseInfo.endTime @@ -971,10 +987,11 @@ function this.ChangeData(type) LogRed("当第三场不需要时 需要先端自己改变数据 修改我的") old_myBattleInfo_result = this.myBattleInfo.result this.myBattleInfo.result = oldTwoOutOfThreeIndex--1 + LogRed("当第三场不需要时 需要先端自己改变数据 修改我的 ".. this.myBattleInfo.result) elseif type == 2 then--竞猜 - LogRed("当第三场不需要时 需要先端自己改变数据 修改竞猜") old_betBattleInfo_result = this.betBattleInfo.result this.betBattleInfo.result = oldTwoOutOfThreeIndex--1 + LogRed("当第三场不需要时 需要先端自己改变数据 修改竞猜 ".. this.betBattleInfo.result) end isChange = true else @@ -990,13 +1007,13 @@ function this.ChangeData(type) this.baseInfo.endTime = old_baseInfo_endTime if type == 1 then--我的 - LogRed("当第三场不需要时 需要先端自己改变数据 返回我的") + LogRed("当第三场不需要时 需要先端自己改变数据 返回我的 "..this.myBattleInfo.result) this.myBattleInfo.result = old_myBattleInfo_result elseif type == 2 then--竞猜 - LogRed("当第三场不需要时 需要先端自己改变数据 返回竞猜") + LogRed("当第三场不需要时 需要先端自己改变数据 返回竞猜 "..this.betBattleInfo.result) this.betBattleInfo.result = old_betBattleInfo_result end - isChange = true + isChange = false end end end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua index 83c63c54a5..35c370e9ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/DoGuessPopup.lua @@ -33,7 +33,7 @@ function DoGuessPopup:BindEvent() ArenaTopMatchManager.SetcurIsShowDoGuessPopup(true) this:ClosePanel() PopupTipPanel.ShowTip(Language[10133]) - LogPink("BagManager.GetItemCountById(GUESS_COIN "..BagManager.GetItemCountById(GUESS_COIN)) + Log("处于战斗时 存储的临时竞猜币数量 "..BagManager.GetItemCountById(GUESS_COIN).."") ArenaTopMatchManager.SetCoinNum(BagManager.GetItemCountById(GUESS_COIN)) end) end) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua index 6d21d4d41f..95f5c9f2f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessTipView.lua @@ -27,6 +27,8 @@ local duration=2 local interval=0.1 --竞猜币数量浮动图 local upAndDownImage={[0]="r_hero_zhanlixiajiang_png",[1]="r_hero_zhanlishangsheng_png"} +--竞猜结果 +local endResult = -1 function ATM_GuessTipView:InitComponent() this.title = Util.GetGameObject(this.gameObject, "Title"):GetComponent("Text") @@ -76,19 +78,21 @@ function ATM_GuessTipView:OnOpen(...) local isBetBlue = myBetTarget == betBattleInfo.myInfo.uid local isBetRed = myBetTarget == betBattleInfo.enemyInfo.uid if betBattleInfo.result == -1 then return end - + endResult = -1 --设置标题 if isBetBlue then local result=betBattleInfo.result this.title.text = resultText[result] this.title.color = resultColor[result] this.coinState.sprite=Util.LoadSprite(upAndDownImage[result]) + endResult = result end if isBetRed then local result=(betBattleInfo.result+1)%2 this.title.text = resultText[result] this.title.color = resultColor[result] this.coinState.sprite=Util.LoadSprite(upAndDownImage[result]) + endResult = result end this.coinState:SetNativeSize() @@ -173,27 +177,21 @@ end --设置竞猜币 function this.SetCoin() - -- local oldNum= ArenaTopMatchManager.GetCoinNum() - -- LogGreen("oldNum "..oldNum.." BagManager.GetItemCountById(GUESS_COIN) "..BagManager.GetItemCountById(GUESS_COIN)) - -- local newNum= (BagManager.GetItemCountById(GUESS_COIN) - oldNum) * ArenaTopMatchManager.rate + oldNum --BagManager.GetItemCountById(GUESS_COIN) - -- local tempNum=oldNum - local oldNum= 100 - local newNum = 100 - if betBattleInfo.result == 1 then - newNum = newNum + (100 - ArenaTopMatchManager.GetCoinNum()) * ArenaTopMatchManager.rate - else - newNum = newNum - (100 - ArenaTopMatchManager.GetCoinNum()) - end + local oldNum= ArenaTopMatchManager.GetCoinNum() + ArenaTopMatchManager.GetMyBetCoins() + local newNum = BagManager.GetItemCountById(GUESS_COIN) + LogRed("endResult "..endResult.." oldNum "..oldNum.." newNum "..newNum.." GetCoinNum "..ArenaTopMatchManager.GetCoinNum().." GetMyBetCoins "..ArenaTopMatchManager.GetMyBetCoins()) local tempNum=oldNum - - LogGreen("oldNum "..oldNum.." newNum "..newNum) if this.coinTimer then this.coinTimer:Stop() this.coinTimer=nil end if not this.coinTimer then this.coinTimer=Timer.New(function() - oldNum=oldNum+math.floor(tonumber((newNum-tempNum)/(duration/interval))) + local addNum = math.floor(tonumber((newNum-tempNum)/(duration/interval))) + if newNum-tempNum > 0 then + addNum = addNum > 0 and addNum or 1 + end + oldNum=oldNum+addNum if oldNum>=newNum then oldNum=newNum this.coinTimer:Stop() diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index 14ab03134b..ebcb18bc96 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -85,12 +85,10 @@ function ATM_GuessView:BindEvent() end function this.battleDetailBtnClick(isShowTip) local betBattleInfo = ArenaTopMatchManager.GetBetBattleInfo() - LogGreen("sssssssssssss "..betBattleInfo.result) if betBattleInfo.result == -1 then Log(Language[10168]) return end - LogGreen("sssssssssssss") local nameStr = betBattleInfo.myInfo.name.."|"..betBattleInfo.enemyInfo.name ArenaTopMatchManager.RequestReplayRecord(betBattleInfo.result, betBattleInfo.fightData, nameStr, function() @@ -271,10 +269,11 @@ function this.RefreshBetRateShow() this.coinNum.text = BagManager.GetItemCountById(GUESS_COIN) local battleState = ArenaTopMatchManager.GetBaseData().battleState - --当处于战斗时 记下当前竞猜币 - if battleState==TOP_MATCH_TIME_STATE.OPEN_IN_END then - -- ArenaTopMatchManager.SetCoinNum(BagManager.GetItemCountById(GUESS_COIN)) - -- Log("处于战斗时 存储的临时竞猜币数量 "..BagManager.GetItemCountById(GUESS_COIN).."") + --当竞猜完 记下当前竞猜币 + local myBetTarget = ArenaTopMatchManager.GetMyBetTarget() + if battleState == TOP_MATCH_TIME_STATE.OPEN_IN_GUESS and myBetTarget and myBetTarget ~= 0 then + ArenaTopMatchManager.SetCoinNum(BagManager.GetItemCountById(GUESS_COIN)) + Log("处于战斗时 存储的临时竞猜币数量 "..BagManager.GetItemCountById(GUESS_COIN).."") end end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index 0004b0aa85..0bf7105295 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -116,8 +116,6 @@ end function this.battleDetailBtnClick() local battleInfo = ArenaTopMatchManager.GetBattleInfo() - - LogGreen("sssssssssssss "..battleInfo.result) if not isJoin or (isJoin and isOver) then return end @@ -125,7 +123,6 @@ function this.battleDetailBtnClick() Log(Language[10168]) return end - LogGreen("sssssssssssss") local nameStr = battleInfo.myInfo.name.."|"..battleInfo.enemyInfo.name ArenaTopMatchManager.RequestReplayRecord(battleInfo.result, battleInfo.fightData, nameStr, function() @@ -160,6 +157,7 @@ function this.SetPlayerInfo() local redInfo = nil LogPink("battleInfo.result "..battleInfo.result) local battleEndResultSortState = true --true 战斗最终直接赋值 false 颠倒赋值 + LogRed("PlayerManager.uid "..PlayerManager.uid.." "..attInfo.uid.." "..defInfo.uid) if attInfo.uid == PlayerManager.uid then blueInfo = attInfo redInfo = defInfo @@ -182,6 +180,7 @@ function this.SetPlayerInfo() local baseData = ArenaTopMatchManager.GetBaseData() commonInfo.SetActive(true) + LogRed("battleEndResultSortState "..tostring(battleEndResultSortState)) commonInfo.SetInfoData(1, blueInfo, redInfo, myResult, baseData == TOP_MATCH_STAGE.CHOOSE,battleEndResultSortState) end