diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 29d88007d6..e3fa0ad898 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -574,22 +574,22 @@ end function this.GetMonsterPros(id, lv, star) local proList = PokemonManager.GetSinglePokemonAddProDataByLvAndStar(id, lv, star) local allProVal = {} - table.insert(allProVal, 1, lv) --等级 - table.insert(allProVal, 2, proList[HeroProType.Hp]) --生命 - table.insert(allProVal, 3, proList[HeroProType.Hp]) --最大生命 - table.insert(allProVal, 4, proList[HeroProType.Attack]) --攻击力 - table.insert(allProVal, 5, proList[HeroProType.PhysicalDefence]) --护甲 - table.insert(allProVal, 6, proList[HeroProType.MagicDefence]) --魔抗 - table.insert(allProVal, 7, proList[HeroProType.Speed]) --速度 - table.insert(allProVal, 8, proList[HeroProType.DamageBocusFactor]) --伤害加成系数(%) - table.insert(allProVal, 9, proList[HeroProType.DamageReduceFactor]) --伤害减免系数(%) - table.insert(allProVal, 10, proList[HeroProType.Hit]) --命中率(%) - table.insert(allProVal, 11, proList[HeroProType.Dodge]) --闪避率(%) - table.insert(allProVal, 12, proList[HeroProType.CritFactor]) --暴击率(%) - table.insert(allProVal, 13, proList[HeroProType.CritDamageFactor]) --暴击伤害系数(%) - table.insert(allProVal, 14, proList[HeroProType.AntiCritDamageFactor]) --抗暴率(%) - table.insert(allProVal, 15, proList[HeroProType.TreatFacter]) --治疗加成系数(%) - table.insert(allProVal, 16, proList[HeroProType.CureFacter]) --受到治疗系数(%) + table.insert(allProVal, 1, lv or 0) --等级 + table.insert(allProVal, 2, proList[HeroProType.Hp] or 0) --生命 + table.insert(allProVal, 3, proList[HeroProType.Hp] or 0) --最大生命 + table.insert(allProVal, 4, proList[HeroProType.Attack] or 0) --攻击力 + table.insert(allProVal, 5, proList[HeroProType.PhysicalDefence] or 0) --护甲 + table.insert(allProVal, 6, proList[HeroProType.MagicDefence] or 0) --魔抗 + table.insert(allProVal, 7, proList[HeroProType.Speed] or 0) --速度 + table.insert(allProVal, 8, proList[HeroProType.DamageBocusFactor] or 0) --伤害加成系数(%) + table.insert(allProVal, 9, proList[HeroProType.DamageReduceFactor] or 0) --伤害减免系数(%) + table.insert(allProVal, 10, proList[HeroProType.Hit] or 1) --命中率(%) 默认为1 + table.insert(allProVal, 11, proList[HeroProType.Dodge] or 0) --闪避率(%) + table.insert(allProVal, 12, proList[HeroProType.CritFactor] or 0) --暴击率(%) + table.insert(allProVal, 13, proList[HeroProType.CritDamageFactor] or 0) --暴击伤害系数(%) + table.insert(allProVal, 14, proList[HeroProType.AntiCritDamageFactor] or 0) --抗暴率(%) + table.insert(allProVal, 15, proList[HeroProType.TreatFacter] or 1) --治疗加成系数(%) 默认为1 + table.insert(allProVal, 16, proList[HeroProType.CureFacter] or 1) --受到治疗系数(%)默认为1 table.insert(allProVal, 17, 0) --异妖伤害加成系数(%) table.insert(allProVal, 18, 0) --异妖减伤率(%) table.insert(allProVal, 19, 0) --火系伤害减免系数(%) @@ -622,7 +622,7 @@ function this.GetMonsterDataFromGroup(gId, camp) star = star } local pros = this.GetMonsterPros(id, level, star) - mUnit.propertys = pros + mUnit.property = pros local mSkill = ConfigManager.GetConfigDataByDoubleKey(ConfigName.SpiritAnimalSkill, "SpiritAnimalMatch", id, "StarMatch", star) mUnit.unitSkillIds = mSkill.Id list[i] = this.PokemonUnitAdapter(mUnit, camp) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index f0f7fcae6e..521601b9e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -274,7 +274,7 @@ end -- 打开,重新打开时回调 function DynamicActivityPanel:OnShow() local activiytId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) - if not activiytId and activiytId <= 0 then + if not activiytId or activiytId <= 0 then self:ClosePanel() end this.btnBack:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index a71033679a..820fda95c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -97,6 +97,8 @@ function LingShouBaoGe:BindEvent() end function LingShouBaoGe:OnShow(_sortingOrder,_parent) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LingShouBaoGe) + if not actId or actId <= 0 then return end parent = _parent sortingOrder = _sortingOrder this.gameObject:SetActive(true) @@ -105,7 +107,6 @@ function LingShouBaoGe:OnShow(_sortingOrder,_parent) end function LingShouBaoGe:Refresh() - LogYellow("shuaxing !!!!!!!!!!!!!!") ActData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LingShouBaoGe) activityId = ActData.activityId LSrewardData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index fe5f45a6b2..4466da519d 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -99,6 +99,7 @@ function QianKunBox:OnShow(sortingOrder,_parent) Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer) orginLayer = sortingOrder activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) + if not activityId or activityId <= 0 then return end local array = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySetting,"ActivityId",activityId) singleRecruit = array[1] tenRecruit = array[2] diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua index a3713d891a..92680e4f97 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua @@ -74,6 +74,7 @@ function ShengYiTianJiang:OnShow(_sortingOrder,_parent) end function ShengYiTianJiang:OnShowData() local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ShenYiTianJiang) + if not activityId or activityId <= 0 then return end local activityConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,activityId) rechargeConfigId = activityConfig.CanBuyRechargeId[1] allData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,rechargeConfigId) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 4b69a2d084..92e7a2ee35 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -299,6 +299,7 @@ function TimeLimitedCall:OnShow(_sortingOrder,_parent) end activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + if not activityId or activityId <= 0 then return end LogBlue("限时招募 activityId:"..activityId) Util.GetGameObject(self.gameObject,activityType[activityId].bg):SetActive(true) Util.GetGameObject(self.gameObject,activityType[activityId].bg.."/Image (3)"):GetComponent("Image").sprite = Util.LoadSprite(activityType[activityId].title) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index dd8b4a963f..bbfcc6b47f 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -83,6 +83,8 @@ function XiangYaoDuoBao:BindEvent() end function XiangYaoDuoBao:OnShow(_sortingOrder,_parent) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XiangYaoDuoBao) + if not actId or actId <= 0 then return end parent = _parent sortingOrder = _sortingOrder this.gameObject:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua index 26e5a782a0..5e306e49e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua @@ -124,6 +124,8 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function XinJiangLaiXi:OnShow(_sortingOrder,_parent) + local actId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinJiangLaiXi) + if not actId or actId <= 0 then return end parent = _parent sortingOrder = _sortingOrder XinJiangLaiXi:Refresh() diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua index 3b43687984..6b6fbcf2fd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua @@ -204,6 +204,11 @@ function GuildInfoPopup:BindEvent() PopupTipPanel.ShowTip(Language[10917]) return end + Timer.New(function () + -- this.RefreshShow() + this.OnTabChange(3) + this.agreeRedpot:SetActive(false) + end,0.3):Start() MyGuildManager.OperateApply(GUILD_APPLY_OPTYPE.ALL_AGREE) end) diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 56bcbb771b..244036fbe8 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -205,6 +205,11 @@ end function RewardBoxPanel:OnBtnSureClick() if curId then local data = {itemData.id,curId,curNum} + if curId <= 0 then + -- body + PopupTipPanel.ShowTip(Language[11796]) + return + end if curNum <= 0 then PopupTipPanel.ShowTip("宝箱开启数量不能为0") return