diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 7a6b803509..ec595a70cd 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -12928,6 +12928,14 @@ MonoBehaviour: extension: .mp3 resPathIndex: 84 resAbNameIndex: 130 + - resName: Audioc_swk_00015_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 130 + - resName: Audio_common_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 130 - resName: Audio_c_ab_00014_attack_01 extension: .mp3 resPathIndex: 85 @@ -13100,6 +13108,10 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 172 + - resName: Audio_c_jbj_0007_attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 172 - resName: Audio_c_jcdp_00027_attack_01 extension: .mp3 resPathIndex: 85 @@ -13252,6 +13264,10 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 210 + - resName: Audio_c_mrzq_0010_skeff_slidesk_attacked + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 210 - resName: Audio_c_mz_00038_attack_01 extension: .mp3 resPathIndex: 85 @@ -13352,6 +13368,10 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 233 + - resName: Audio_c_ts_00017_attack_01_1 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 233 - resName: Audio_c_ttjz_00048_attack_01 extension: .mp3 resPathIndex: 85 @@ -13600,6 +13620,10 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 273 + - resName: Audio_FX_c_yxz_0057_skill01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 273 - resName: Audio_fx_Effect_CST_skill01 extension: .mp3 resPathIndex: 85 @@ -13708,6 +13732,10 @@ MonoBehaviour: extension: .mp3 resPathIndex: 85 resAbNameIndex: 300 + - resName: Audio_m_mh_0046__attack_01 + extension: .mp3 + resPathIndex: 85 + resAbNameIndex: 300 - resName: Audio_m_mmls_0045_attack_01 extension: .mp3 resPathIndex: 85 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 46a06fc786..6627cd75cd 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1892,7 +1892,8 @@ DeathPosStatus={ Death=-1, Close=0, Fight=1, - Reward=2 + Reward=2, + Belated=0,--十绝阵开启才加入工会 } --公会车迟 阶段类型 1挑战 2间歇 3抢夺 GuildCarDelayProType={ 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/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index e8175553e0..62e0250391 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -87,6 +87,11 @@ function DeathPosInfoPanel:BindEvent() PopupTipPanel.ShowTip(Language[11047]) return end + LogYellow("DeathPosManager.allowchallange:"..DeathPosManager.allowchallange) + if DeathPosManager.allowchallange==DeathPosStatus.Belated then + PopupTipPanel.ShowTip("挑战阶段加入公会,不允许参与本轮十绝阵!") + return + end if DeathPosManager.battleTime<=0 then PopupTipPanel.ShowTip(Language[11048]) return diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua index 0f85e9a0b7..e096c9b308 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosManager.lua @@ -2,6 +2,7 @@ local this = DeathPosManager local guildSetting=ConfigManager.GetConfig(ConfigName.GuildSetting) this.status=0 --十绝阵阶段状态 0未开启 1挑战阶段 2领奖阶段 +this.allowchallange = 0--是否中途加入公会 local rewardData={} --全部宝箱奖励数据(未翻牌) local myRewardData={} --全部宝箱奖励数据(已翻牌) local doRewardData={} --其他玩家点击领取奖励推送数据(单组数据) @@ -26,6 +27,7 @@ function this.InitData(func) return end NetManager.GetDeathPathStatusResponse(function(msg) + this.allowchallange=msg.allowchallange this.status=msg.status if this.status==DeathPosStatus.Fight then --请求剩余挑战次数 NetManager.GetDeathPathInfoResponse(function(msg1)