From a27c474098bdf7bc800917991d2b7d56eb92f3fe Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 16 Jul 2020 17:28:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...dio_Effect_c_jcdp_00027_attack_02.mp3.meta | 43 ---------------- .../ResConfigs/ResourcePathConfig.asset | 37 +++++++++++--- .../~Lua/Message/ArenaInfoProto_pb.lua | 50 +++++++++++++++++-- .../~Lua/Message/MapInfoProto_pb.lua | 13 ++++- .../~Lua/Message/PlayerInfoProto_pb.lua | 13 ++++- .../~Lua/Modules/Map/MapTrialManager.lua | 2 + .../~Lua/Modules/Map/TrialMapPanel.lua | 2 +- .../Popup/View/GeneralPopup_TrialBomb.lua | 2 +- 8 files changed, 106 insertions(+), 56 deletions(-) delete mode 100644 Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_jcdp_00027_attack_02.mp3.meta diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_jcdp_00027_attack_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_jcdp_00027_attack_02.mp3.meta deleted file mode 100644 index fe81f7524f..0000000000 --- a/Assets/ManagedResources/Audio/Skill/skill/Audio_Effect_c_jcdp_00027_attack_02.mp3.meta +++ /dev/null @@ -1,43 +0,0 @@ -fileFormatVersion: 2 -guid: ab6856755441608418b84c469b947a94 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: - 1: - loadType: 2 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 4: - loadType: 2 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - 7: - loadType: 2 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 8d8a8eb67c..5fb63d1634 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -4964,10 +4964,6 @@ MonoBehaviour: extension: .png resPathIndex: 28 resAbNameIndex: 14 - - resName: r_shouchong_santiao - extension: .png - resPathIndex: 28 - resAbNameIndex: 14 - resName: s_shouchong_100 extension: .png resPathIndex: 28 @@ -4988,6 +4984,10 @@ MonoBehaviour: extension: .png resPathIndex: 28 resAbNameIndex: 14 + - resName: s_shouchong_huodongtiao + extension: .png + resPathIndex: 28 + resAbNameIndex: 14 - resName: s_shouchong_slogan extension: .png resPathIndex: 28 @@ -7136,6 +7136,10 @@ MonoBehaviour: extension: .png resPathIndex: 38 resAbNameIndex: 19 + - resName: r_zjm_huodongicon-shunwukongshouchong + extension: .png + resPathIndex: 38 + resAbNameIndex: 19 - resName: r_zjm_huodongicon-tanbao extension: .png resPathIndex: 38 @@ -13496,6 +13500,10 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 + - resName: Audio_Effect_c_dj_0008_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 273 - resName: Audio_Effect_c_dj_0008_attack_02 extension: .mp3 resPathIndex: 85 @@ -13508,11 +13516,19 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 + - resName: Audio_Effect_c_ghn_0009_t3_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 273 - resName: Audio_Effect_c_ghn_0009_t3_attack_02 extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 - - resName: Audio_Effect_c_jcdp_00027_attack_02 + - resName: Audio_Effect_c_jcdp_00027_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 273 + - resName: Audio_Effect_c_jmm_0006_attack_01 extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 @@ -13528,11 +13544,19 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 + - resName: Audio_Effect_c_kqmw_00018_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 273 - resName: Audio_Effect_c_kqmw_00018_attack_02 extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 - - resName: Audio_Effect_c_nz_00029_t3_attack_02 + - resName: Audio_Effect_c_nz_00029_t3_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 273 + - resName: Audio_Effect_c_rd_00019_t3_attack_01 extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 @@ -41066,6 +41090,7 @@ MonoBehaviour: - assetBundleName: lz4/prefabs/ui/firstrecharge.unity3d dependences: - lz4/atlas/firstrechargeatlas.unity3d + - lz4/atlas/mainatlas.unity3d - lz4/atlas/publicatlas.unity3d - lz4/atlas/timelimitedcall.unity3d - lz4/fonts/fzjinls.unity3d diff --git a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua index 3522a0aafb..9fc4436283 100644 --- a/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua @@ -39,6 +39,8 @@ CHAMPIONGETINFORESPONSE_MYRANK_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETINFORESPONSE_MAXRANK_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETINFORESPONSE_CHAMPIONBATTLEINFO_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETINFORESPONSE_MYSCORE_FIELD = protobuf.FieldDescriptor(); +CHAMPIONGETINFORESPONSE_PROCESS_FIELD = protobuf.FieldDescriptor(); +CHAMPIONGETINFORESPONSE_LOSER_FIELD = protobuf.FieldDescriptor(); CHAMPIONPROGRESSUPDATEINDICATION = protobuf.Descriptor(); CHAMPIONPROGRESSUPDATEINDICATION_PROGRESS_FIELD = protobuf.FieldDescriptor(); CHAMPIONPROGRESSUPDATEINDICATION_ENDTIME_FIELD = protobuf.FieldDescriptor(); @@ -48,6 +50,7 @@ CHAMPIONGETBETRESPONSE = protobuf.Descriptor(); CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD = protobuf.FieldDescriptor(); CHAMPIONGETBETRESPONSE_WINUID_FIELD = protobuf.FieldDescriptor(); +CHAMPIONGETBETRESPONSE_PROCESS_FIELD = protobuf.FieldDescriptor(); CHAMPIONBETREQEUST = protobuf.Descriptor(); CHAMPIONBETREQEUST_WINUID_FIELD = protobuf.FieldDescriptor(); CHAMPIONBETREQEUST_COINS_FIELD = protobuf.FieldDescriptor(); @@ -74,6 +77,7 @@ CHAMPIONGETALLMYBETINFORESPONSE = protobuf.Descriptor(); CHAMPIONGETALLMYBETINFORESPONSE_CHAMPIONMYBETDETAILS_FIELD = protobuf.FieldDescriptor(); CHAMPIONVIEWFINALREQUEST = protobuf.Descriptor(); CHAMPIONVIEWFINALREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD = protobuf.FieldDescriptor(); CHAMPIONVIEWFINALRESPONSE = protobuf.Descriptor(); CHAMPIONVIEWFINALRESPONSE_CHAMPIONBATTLEPAIRINFO_FIELD = protobuf.FieldDescriptor(); CHAMPIONGUESSSUCCESSINDICATION = protobuf.Descriptor(); @@ -406,11 +410,31 @@ CHAMPIONGETINFORESPONSE_MYSCORE_FIELD.default_value = 0 CHAMPIONGETINFORESPONSE_MYSCORE_FIELD.type = 5 CHAMPIONGETINFORESPONSE_MYSCORE_FIELD.cpp_type = 1 +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.name = "process" +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetInfoResponse.process" +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.number = 8 +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.index = 7 +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.label = 1 +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.has_default_value = false +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.default_value = 0 +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.type = 5 +CHAMPIONGETINFORESPONSE_PROCESS_FIELD.cpp_type = 1 + +CHAMPIONGETINFORESPONSE_LOSER_FIELD.name = "loser" +CHAMPIONGETINFORESPONSE_LOSER_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetInfoResponse.loser" +CHAMPIONGETINFORESPONSE_LOSER_FIELD.number = 9 +CHAMPIONGETINFORESPONSE_LOSER_FIELD.index = 8 +CHAMPIONGETINFORESPONSE_LOSER_FIELD.label = 1 +CHAMPIONGETINFORESPONSE_LOSER_FIELD.has_default_value = false +CHAMPIONGETINFORESPONSE_LOSER_FIELD.default_value = false +CHAMPIONGETINFORESPONSE_LOSER_FIELD.type = 8 +CHAMPIONGETINFORESPONSE_LOSER_FIELD.cpp_type = 7 + CHAMPIONGETINFORESPONSE.name = "ChampionGetInfoResponse" CHAMPIONGETINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.ChampionGetInfoResponse" CHAMPIONGETINFORESPONSE.nested_types = {} CHAMPIONGETINFORESPONSE.enum_types = {} -CHAMPIONGETINFORESPONSE.fields = {CHAMPIONGETINFORESPONSE_JOINSTATE_FIELD, CHAMPIONGETINFORESPONSE_PROGRESS_FIELD, CHAMPIONGETINFORESPONSE_ENDTIME_FIELD, CHAMPIONGETINFORESPONSE_MYRANK_FIELD, CHAMPIONGETINFORESPONSE_MAXRANK_FIELD, CHAMPIONGETINFORESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETINFORESPONSE_MYSCORE_FIELD} +CHAMPIONGETINFORESPONSE.fields = {CHAMPIONGETINFORESPONSE_JOINSTATE_FIELD, CHAMPIONGETINFORESPONSE_PROGRESS_FIELD, CHAMPIONGETINFORESPONSE_ENDTIME_FIELD, CHAMPIONGETINFORESPONSE_MYRANK_FIELD, CHAMPIONGETINFORESPONSE_MAXRANK_FIELD, CHAMPIONGETINFORESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETINFORESPONSE_MYSCORE_FIELD, CHAMPIONGETINFORESPONSE_PROCESS_FIELD, CHAMPIONGETINFORESPONSE_LOSER_FIELD} CHAMPIONGETINFORESPONSE.is_extendable = false CHAMPIONGETINFORESPONSE.extensions = {} CHAMPIONPROGRESSUPDATEINDICATION_PROGRESS_FIELD.name = "progress" @@ -489,11 +513,21 @@ CHAMPIONGETBETRESPONSE_WINUID_FIELD.default_value = 0 CHAMPIONGETBETRESPONSE_WINUID_FIELD.type = 5 CHAMPIONGETBETRESPONSE_WINUID_FIELD.cpp_type = 1 +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.name = "process" +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionGetBetResponse.process" +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.number = 4 +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.index = 3 +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.label = 1 +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.has_default_value = false +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.default_value = 0 +CHAMPIONGETBETRESPONSE_PROCESS_FIELD.type = 5 +CHAMPIONGETBETRESPONSE_PROCESS_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.fields = {CHAMPIONGETBETRESPONSE_CHAMPIONBATTLEINFO_FIELD, CHAMPIONGETBETRESPONSE_CHAMPIONBETINFO_FIELD, CHAMPIONGETBETRESPONSE_WINUID_FIELD, CHAMPIONGETBETRESPONSE_PROCESS_FIELD} CHAMPIONGETBETRESPONSE.is_extendable = false CHAMPIONGETBETRESPONSE.extensions = {} CHAMPIONBETREQEUST_WINUID_FIELD.name = "winUid" @@ -732,11 +766,21 @@ CHAMPIONVIEWFINALREQUEST_TYPE_FIELD.default_value = 0 CHAMPIONVIEWFINALREQUEST_TYPE_FIELD.type = 5 CHAMPIONVIEWFINALREQUEST_TYPE_FIELD.cpp_type = 1 +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.name = "page" +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.full_name = ".com.ljsd.jieling.protocols.ChampionViewFinalRequest.page" +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.number = 2 +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.index = 1 +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.label = 1 +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.has_default_value = false +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.default_value = 0 +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.type = 5 +CHAMPIONVIEWFINALREQUEST_PAGE_FIELD.cpp_type = 1 + CHAMPIONVIEWFINALREQUEST.name = "ChampionViewFinalRequest" CHAMPIONVIEWFINALREQUEST.full_name = ".com.ljsd.jieling.protocols.ChampionViewFinalRequest" CHAMPIONVIEWFINALREQUEST.nested_types = {} CHAMPIONVIEWFINALREQUEST.enum_types = {} -CHAMPIONVIEWFINALREQUEST.fields = {CHAMPIONVIEWFINALREQUEST_TYPE_FIELD} +CHAMPIONVIEWFINALREQUEST.fields = {CHAMPIONVIEWFINALREQUEST_TYPE_FIELD, CHAMPIONVIEWFINALREQUEST_PAGE_FIELD} CHAMPIONVIEWFINALREQUEST.is_extendable = false CHAMPIONVIEWFINALREQUEST.extensions = {} CHAMPIONVIEWFINALRESPONSE_CHAMPIONBATTLEPAIRINFO_FIELD.name = "championBattlePairInfo" 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..b391325e85 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(); @@ -580,11 +581,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" diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 79b44d666f..8f2195cebe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -30,6 +30,7 @@ function this.Initialize() -- this.isFirstIn=false --是否第一次进入副本 退出副本时置为false this.trialRewardInfo={} --试炼领奖信息 this.killCount=0 --已击杀小怪数量 + this.bombUsed=0 --炸弹已使用次数 end function this.RefreshTrialInfo(towerCopyInfo) @@ -44,6 +45,7 @@ function this.RefreshTrialInfo(towerCopyInfo) -- this.trialRewardInfo=towerCopyInfo.trialRewardInfo this.InitTrialRewardData(towerCopyInfo.trialRewardInfo) this.killCount=towerCopyInfo.killCount + this.bombUsed=towerCopyInfo.bombUsed -- 最后一层需要赋值 this.bossDeadTime = towerCopyInfo.towerUseTime diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 9701b591f3..9aaf32d9c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -126,7 +126,7 @@ function TrialMapPanel:BindEvent() Util.AddClick(this.btnBomb, function () - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialBomb,1) + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.TrialBomb) -- bombNum = BagManager.GetTempBagCountById(43) -- this.bombNum.text = bombNum -- LogGreen(bombNum) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua index 37979d548f..0c86f769a7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua @@ -104,7 +104,7 @@ function this:OnShow(_parent,...) itemId=trialSetting[1].BombId[1][1] itemNum= BagManager.GetItemCountById(itemId) -- LogBlue(BagManager.GetItemCountById(itemId)) - usedNum=_args[1] + usedNum=MapTrialManager.bombUsed this.RefreshPanel() end