From df76a49401f291ba7f8adbe5d7406b38539b8a04 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 27 Apr 2021 14:33:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E7=A2=8E=E7=89=87=E8=87=AA?= =?UTF-8?q?=E9=80=89=E7=AE=B1=E3=80=91=E9=80=9A=E8=BF=87=E9=81=93=E5=85=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E5=88=AB=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E6=96=B9=EF=BC=8C=E8=BF=94=E5=9B=9E=E5=90=8E=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RewardBox/RewardBoxPanel.lua | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index 40677f96cd..dc4e494701 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -103,6 +103,16 @@ function RewardBoxPanel:OnOpen(...) this.scroll.gameObject:GetComponent("RectTransform").anchoredPosition = #this.rewardGroup ~= 1 and Vector2.New(0, 376) or Vector2.New(0, 444) this.ScrollView.gameObject:GetComponent("RectTransform").sizeDelta = #this.rewardGroup ~= 1 and Vector2.New(940, 830) or Vector2.New(940, 900) +end + +-- 打开,重新打开时回调 +function RewardBoxPanel:OnShow() + this.name.text = GetLanguageStrById(itemConfig[this.itemId].Name) + itemList={} + curId = nil + tagNum = 1 + + --刷新按钮亮光 this.selectList ={} for n = 1, this.selectBar.transform.childCount-1 do--设置当前页签 table.insert(this.selectList,this.selectBar.transform:GetChild(n).gameObject) @@ -121,14 +131,6 @@ function RewardBoxPanel:OnOpen(...) end) end -end - --- 打开,重新打开时回调 -function RewardBoxPanel:OnShow() - this.name.text = GetLanguageStrById(itemConfig[this.itemId].Name) - itemList={} - curId = nil - tagNum = 1 self:RefreshData() end From 014623000f863c92fd083b3472fdb51a5cf871ef Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 27 Apr 2021 14:34:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExcelTool/DataConfigMD5Record.asset | 758 +++++++++--------- 1 file changed, 381 insertions(+), 377 deletions(-) diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset index 194e941271..d33d338c25 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset +++ b/Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset @@ -13,420 +13,424 @@ MonoBehaviour: m_Name: DataConfigMD5Record m_EditorClassIdentifier: _keys: - - ArenaRobotSetting.xlsx - - ArroGantFly.xlsx - - AdventureConfig.xlsx - - ArenaRobotConfig.xlsx - - AreaConfig.xlsx - ActivityDropReward.xlsx - - ArenaReward.xlsx + - AchievementConfig.xlsx + - ActivityRewardConfig.xlsx - EquipSignSetting.xlsx - - AdventureReward.xlsx + - EquipStarsConfig.xlsx - EquipSuiteConfig.xlsx + - EquipTalismana.xlsx - EquipTalismanaLottery.xlsx - EquipTalismanaRankup.xlsx - - ArenaBattleReward.xlsx + - ActivityRankingReward.xlsx - ErrorCodeHint.xlsx - - ArenaSetting.xlsx + - ErrorCodeEerverConfig.xlsx + - ExchangeActivityConfig.xlsx - ExchangeRate.xlsx + - ExpeditionFloorConfig.xlsx + - ExpeditionHolyConfig.xlsx - ExpeditionNodeConfig.xlsx + - ExpeditionRecruitConfig.xlsx + - ExpeditionSetting.xlsx - ExploreFunctionConfig.xlsx - FakeBattle.xlsx - - BlessingConfig.xlsx - - ExpeditionRecruitConfig.xlsx - FakeBattleNew.xlsx - - BeginnerTask.xlsx - - BlessingConfigNew.xlsx - - BlessingRewardPool.xlsx - - BeStronger.xlsx - - GameSetting.xlsx - - BloodyBattleReward.xlsx - - BlessingRewardPoolNew.xlsx - - GoodLuck.xlsx - - GodSacrificeSetting.xlsx - - BloodyBattleTask.xlsx - - BloodyBattleSetting.xlsx - - GuildBossRewardConfig.xlsx - - ChallengeStarBox.xlsx - - GuildHelpConfig.xlsx - - GlobalSystemConfig.xlsx - - GuildRedPackConfig.xlsx - - GuildRewardConfig.xlsx - - AudioConfig.xlsx - - GuildSacrificeConfig.xlsx - - GuildScoreConfig.xlsx - - GuildSacrificeRewardConfig.xlsx - - GuildSetting.xlsx - - BloodyMessagesConfig.xlsx - - GuildWarConfig.xlsx - - FoodsConfig.xlsx - - BloodyRankConfig.xlsx - - ExpeditionHolyConfig.xlsx - - HeroRankupGroup.xlsx - - FreeTravel.xlsx - - ErrorCodeEerverConfig.xlsx - - HeroSacrifice.xlsx - - AchievementConfig.xlsx - - Hongmeng.xlsx - - ExpeditionSetting.xlsx - - ExpeditionFloorConfig.xlsx - - ActivityGroups.xlsx - - EquipStarsConfig.xlsx - - HongmengUp.xlsx - - GuildLevelConfig.xlsx - - ActivityRankingReward.xlsx - - HeroSkin.xlsx - - ChallengeSetting.xlsx - - ChampionshipSetting.xlsx - - GodSacrificeConfig.xlsx - - BuffEffectConfig.xlsx - - GuildBossConfig.xlsx - - BloodyBattleTreasure.xlsx - - GuildCheckpointConfig.xlsx - - GuildWarRewardConfig.xlsx - - GlobalActivity.xlsx - - LevelSetting.xlsx - - HeroRankupConfig.xlsx - - HeroReturn.xlsx - - ExchangeActivityConfig.xlsx - - MissionEventsConfig.xlsx - - MainLevelBoss.xlsx - - LuckyCatConfig.xlsx - - LuxuryFund.xlsx - - MonthcardConfig.xlsx - - NewHeroConfig.xlsx - - MonsterViewConfig.xlsx - - GuildCheckpointRank.xlsx - - OptionAddCondition.xlsx - - GuideConfig.xlsx - - PlayerAppearance.xlsx - - EquipSign.xlsx - - LoginPosterConfig.xlsx - FloodConfig.xlsx - - JumpConfig.xlsx - - ChallengeMapConfig.xlsx - - JewelResonanceConfig.xlsx - - ChallengeMissionConfig.xlsx - - AccomplishmentConfig.xlsx - - ElementalResonanceConfig.xlsx - - MazeTreasureSetting.xlsx - - JewelConfig.xlsx - - MainMapIconConfig.xlsx - - PlayerHeadIcon.xlsx - - PlayerMountLevelUp.xlsx - - LotterySetting.xlsx - - MazeTreasure.xlsx - - PlayerRole.xlsx - - PropertyConfig.xlsx - - QAConfig.xlsx - - RaceTowerRewardConfig.xlsx - - PrivilegeTypeConfig.xlsx - - RaceTowerConfig.xlsx - - RecommendTeam.xlsx - - RobotSkill.xlsx - - RunesConfig.xlsx - - SevenDaysActivity.xlsx - - SeverConfig.xlsx - - RunesPoolConfig.xlsx - - SignInConfig.xlsx - - SpiritAnimalSetting.xlsx - - RobotProperty.xlsx - - RoleConfig.xlsx - - MainLevelSettingConfig.xlsx - - LotterySpecialConfig.xlsx - - SpecialConfig.xlsx - - PlayerLevelConfig.xlsx - - RandomName.xlsx - - SpiritAnimalBook.xlsx - - StoreTypeConfig.xlsx - - SystemMessageConfig.xlsx - - SevenDaysScore.xlsx - - TestWelfare.xlsx - - TipsConfig.xlsx - - RewardItemConfig.xlsx - - TaskConfig.xlsx - - LevelDifficultyConfig.xlsx - - SpiritAnimal.xlsx - - TrialSetting.xlsx - - TrialwelfareConfig.xlsx - - SpiritAnimalStar.xlsx - - ChampionshipReward.xlsx - - SpiritAnimalSummon.xlsx - - TrialKillConfig.xlsx - - TrialQuestionConfig.xlsx + - FoodsConfig.xlsx + - FreeTravel.xlsx - FreeTravelStore.xlsx - - WorkShopSetting.xlsx - - ChapterOptionConfig.xlsx - - WorkShopTechnologySetting.xlsx - - WorldBossConfig.xlsx - - WorldBossRewardConfig.xlsx - - WorldBossSetting.xlsx - - WorldBossTreasureConfig.xlsx - - SpiritAnimalSkill.xlsx - - TrialGameConfig.xlsx - - WorkShopRebuildConfig.xlsx - - WorkShopFoundationConfig.xlsx - - TreasureSunlongConfig.xlsx - - WorkShopFunctionConfig.xlsx - - ThemeActivityTaskConfig.xlsx - - ArtResourcesConfig.xlsx - - WorkShopEquipmentConfig.xlsx - - TreasureSunlongTaskConfig.xlsx - - PassiveSkillConfig.xlsx + - GameSetting.xlsx + - GlobalActivity.xlsx + - GlobalSystemConfig.xlsx + - GodSacrificeConfig.xlsx + - GodSacrificeSetting.xlsx + - GoodLuck.xlsx + - GuideConfig.xlsx + - GuildBossConfig.xlsx + - GuildBossRewardConfig.xlsx + - GuildCheckpointConfig.xlsx + - GuildCheckpointRank.xlsx + - GuildHelpConfig.xlsx + - GuildLevelConfig.xlsx + - GuildRedPackConfig.xlsx + - AdventureConfig.xlsx + - GuildSacrificeConfig.xlsx + - GuildSacrificeRewardConfig.xlsx + - GuildScoreConfig.xlsx + - GuildSetting.xlsx + - GuildTechnology.xlsx + - GuildWarConfig.xlsx + - EventPointConfig.xlsx + - GuildWarRewardConfig.xlsx - EquipPropertyPool.xlsx - - VipLevelConfig.xlsx - - DialRewardSetting.xlsx - - ChapterEventPointConfig.xlsx - - HeroConfig.xlsx - - TreasureTaskConfig.xlsx - - SkillConfig.xlsx - HeroLevelConfig.xlsx - - TrialConfig.xlsx - - UIConfig.xlsx - - ActivityRewardConfig.xlsx - - DialRewardConfig.xlsx - - CustomEventConfig.xlsx - - DailyChallengeConfig.xlsx - - ComposeActivity.xlsx - - EndlessDifficulty.xlsx - - DifferDemonsBoxPools.xlsx + - HeroRankupConfig.xlsx + - HeroRankupGroup.xlsx + - HeroSacrifice.xlsx + - HeroReturn.xlsx + - HeroSkin.xlsx + - Hongmeng.xlsx + - EquipSign.xlsx + - HongmengUp.xlsx + - EquipConfig.xlsx - EndlessMapConfig.xlsx - ItemConfig.xlsx - - ChallengeConfig.xlsx - - ComposeBook.xlsx + - EndlessDifficulty.xlsx + - BloodyBattleReward.xlsx + - ElementalResonanceConfig.xlsx - DifferDemonsConfig.xlsx - - DailyTasksConfig.xlsx - - DifferDemonsBoxSeaons.xlsx - - DifferDemonsStageConfig.xlsx - - EquipConfig.xlsx - - CombatControl.xlsx - - GuildTechnology.xlsx - - MapPointConfig.xlsx - - DifferDemonsBoxSetting.xlsx - - LotteryRewardConfig.xlsx - - PassiveSkillLogicConfig.xlsx - - RechargeCommodityConfig.xlsx - - DialogueViewConfig.xlsx - - SpiritAnimalLevel.xlsx - DifferDemonsComonpentsConfig.xlsx - - WorkShopTechnology.xlsx + - DifferDemonsBoxPools.xlsx + - DifferDemonsBoxSetting.xlsx + - DifferDemonsBoxSeaons.xlsx + - DialRewardSetting.xlsx + - DialRewardConfig.xlsx + - DailyTasksConfig.xlsx + - CustomEventConfig.xlsx + - DialogueViewConfig.xlsx + - ComposeBook.xlsx + - DailyChallengeConfig.xlsx + - ComposeActivity.xlsx + - ChapterOptionConfig.xlsx + - ChampionshipSetting.xlsx + - CombatControl.xlsx + - ChampionshipReward.xlsx + - ChallengeStarBox.xlsx + - ChallengeSetting.xlsx + - ChallengeMissionConfig.xlsx + - ChallengeMapConfig.xlsx + - BloodyRankConfig.xlsx + - BloodyMessagesConfig.xlsx + - BuffEffectConfig.xlsx + - ChallengeConfig.xlsx + - BloodyBattleTreasure.xlsx + - BloodyBattleTask.xlsx + - BloodyBattleSetting.xlsx + - BlessingRewardPoolNew.xlsx + - BlessingConfigNew.xlsx + - BlessingRewardPool.xlsx + - DifferDemonsStageConfig.xlsx + - BlessingConfig.xlsx + - GuildRewardConfig.xlsx + - BeginnerTask.xlsx + - AudioConfig.xlsx + - ArenaSetting.xlsx + - ArroGantFly.xlsx + - ArenaRobotSetting.xlsx + - ArenaBattleReward.xlsx + - JewelConfig.xlsx + - ArtResourcesConfig.xlsx + - ArenaRobotConfig.xlsx + - AreaConfig.xlsx + - AccomplishmentConfig.xlsx + - ArenaReward.xlsx + - AdventureReward.xlsx + - JewelResonanceConfig.xlsx - JewelRankupConfig.xlsx - - SkillLogicConfig.xlsx - - OptionConfig.xlsx - - StoreConfig.xlsx - - RewardGroup.xlsx - - EventPointConfig.xlsx - - EquipTalismana.xlsx - - MonsterGroup.xlsx - - MainLevelConfig.xlsx + - ChapterEventPointConfig.xlsx + - JumpConfig.xlsx + - LevelSetting.xlsx + - LoginPosterConfig.xlsx + - LotterySetting.xlsx + - LotterySpecialConfig.xlsx + - LotteryRewardConfig.xlsx + - BeStronger.xlsx + - LevelDifficultyConfig.xlsx + - LuckyCatConfig.xlsx + - LuxuryFund.xlsx - Language.xlsx + - MainLevelSettingConfig.xlsx + - MainLevelBoss.xlsx + - MainMapIconConfig.xlsx + - MazeTreasure.xlsx + - MainLevelConfig.xlsx + - MissionEventsConfig.xlsx + - MapPointConfig.xlsx + - MonsterViewConfig.xlsx + - MonsterGroup.xlsx + - MonthcardConfig.xlsx + - NewHeroConfig.xlsx + - OptionAddCondition.xlsx + - HeroConfig.xlsx + - PassiveSkillConfig.xlsx + - PlayerAppearance.xlsx + - PassiveSkillLogicConfig.xlsx + - PlayerHeadIcon.xlsx + - PlayerMountLevelUp.xlsx + - PlayerLevelConfig.xlsx + - PlayerRole.xlsx + - PrivilegeTypeConfig.xlsx + - QAConfig.xlsx + - PropertyConfig.xlsx + - RaceTowerConfig.xlsx + - RaceTowerRewardConfig.xlsx + - RandomName.xlsx + - RecommendTeam.xlsx + - RewardGroup.xlsx + - ActivityGroups.xlsx + - RobotSkill.xlsx + - RobotProperty.xlsx + - RoleConfig.xlsx + - RunesConfig.xlsx + - RunesPoolConfig.xlsx + - SevenDaysActivity.xlsx + - SevenDaysScore.xlsx + - SeverConfig.xlsx + - SignInConfig.xlsx + - SkillLogicConfig.xlsx + - SkillConfig.xlsx + - RewardItemConfig.xlsx + - SpiritAnimal.xlsx + - SpiritAnimalBook.xlsx + - PackPush.xlsx + - MazeTreasureSetting.xlsx + - OptionConfig.xlsx + - SpiritAnimalLevel.xlsx + - SpiritAnimalSetting.xlsx + - SpiritAnimalSkill.xlsx + - SpiritAnimalStar.xlsx + - SpiritAnimalSummon.xlsx + - StoreTypeConfig.xlsx + - SystemMessageConfig.xlsx + - TestWelfare.xlsx + - TaskConfig.xlsx + - ThemeActivityTaskConfig.xlsx + - TreasureSunlongTaskConfig.xlsx + - TreasureSunlongConfig.xlsx + - TreasureTaskConfig.xlsx + - TrialGameConfig.xlsx + - TrialConfig.xlsx + - TrialQuestionConfig.xlsx + - TrialKillConfig.xlsx + - TrialSetting.xlsx + - UIConfig.xlsx + - TipsConfig.xlsx + - WorldBossSetting.xlsx + - WorkShopRebuildConfig.xlsx + - TrialwelfareConfig.xlsx + - StoreConfig.xlsx + - WorldBossRewardConfig.xlsx + - WorkShopTechnologySetting.xlsx + - WorkShopEquipmentConfig.xlsx + - WorkShopFoundationConfig.xlsx + - WorkShopSetting.xlsx + - WorkShopFunctionConfig.xlsx + - WorldBossConfig.xlsx + - WorldBossTreasureConfig.xlsx + - SpecialConfig.xlsx + - WorkShopTechnology.xlsx + - VipLevelConfig.xlsx + - StoryMapConfig.xlsx - MonsterConfig.xlsx + - RechargeCommodityConfig.xlsx _values: - - 1289424307 - - 471821500 - - 1848421159 - - 1708059082 - - 413963702 - 3591751192 - - 2296996310 + - 328220899 + - 2759220930 - 3517900411 - - 613479935 + - 494399256 - 3970601015 + - 1739812741 - 2568046174 - 2294226303 - - 1262639923 + - 3845553407 - 1435072166 - - 1924824445 + - 1681529351 + - 3277838634 - 2704094373 + - 4026160938 + - 721538452 - 3425624132 + - 3186903494 + - 4114122317 - 1382260277 - 3224705358 - - 996682802 - - 3186903494 - - 3987930196 - - 755222564 - - 2585233359 - - 939963957 - - 1590663081 + - 3586117955 + - 3663554237 + - 2204989227 + - 883391866 + - 2044535010 - 747659102 - - 230994945 - - 3441673156 - - 838236963 + - 2316698434 + - 1135690363 + - 2576521861 - 3254997270 + - 838236963 + - 447417878 + - 173728414 + - 3943131728 + - 2419872323 + - 2801645030 + - 3894020600 + - 3153364400 + - 475620184 + - 1848421159 + - 1996735664 + - 1468913191 + - 3079207713 + - 164852538 + - 3259412568 + - 3249316745 + - 455604419 + - 2445182985 + - 3153107712 + - 2088609989 + - 3729231061 + - 2276520862 + - 306567717 + - 776412998 + - 2048469134 + - 562911120 + - 1790592577 + - 3314253473 + - 2145695820 + - 3356066097 + - 2193042811 + - 1241055907 + - 230994945 + - 583891024 + - 460607005 + - 568553271 + - 903221398 + - 932779961 + - 249002466 + - 4198004043 + - 4255887021 + - 2585514323 + - 2944506204 + - 106656142 + - 3628475072 + - 1774803500 + - 3430281939 + - 1526345420 + - 3338153430 + - 2575541126 + - 2943614740 + - 1565259591 + - 1705732776 + - 1572157444 + - 1678524219 + - 3548626589 + - 4055477448 + - 442457434 + - 2759035733 + - 3507522218 - 2131302457 - 2050621784 - - 3943131728 - - 1565259591 - - 3894020600 - - 1790146285 - - 475620184 - - 1442255327 - - 2003746136 - - 1996735664 - - 3079207713 - - 1468913191 - - 164852538 - - 4055477448 - - 3249316745 - - 2204989227 - - 3548626589 - - 721538452 - - 583884094 - - 883391866 - - 3399903193 - - 306567717 - - 328220899 - - 562911120 - - 4114122317 - - 4026160938 - - 1708319480 - - 494399256 - - 3314253473 - - 3153364400 - - 4068888059 - - 2048469134 - - 1705732776 - - 3338153430 - - 2576521861 - - 442457434 - - 173728414 - - 3507522218 - - 2075385657 - - 2445182985 - - 3305246698 - - 3705022903 - - 3729231061 - - 776412998 - - 2596936745 - - 3625815197 - - 2028967550 - - 2479323017 - - 2903827109 - - 668898046 - - 199397294 - - 515856748 - - 2801645030 - - 683415129 - - 3830908951 - - 568109215 - - 1790592577 - - 681658265 - - 3663554237 - - 3761247138 - - 1678524219 - - 3597116301 - - 1572157444 - - 427098595 - - 583891024 - - 4161852960 - - 727009153 - - 260126611 - - 1482787151 - - 319164499 - - 3244373986 - - 2211830179 - - 4206381187 - - 3318418450 - - 910631348 - - 595190689 - - 3568583865 - - 3432833699 - - 2061972234 - - 2928186292 - - 1155516420 - - 160427834 - - 2748321716 - - 804383039 - - 29725303 - - 1089545938 - - 2322028500 - - 3349139894 - - 1393544882 - - 533462004 - - 2727573240 - - 1801742725 - - 38983593 - - 2311098250 - - 3805010767 - - 297530923 - - 1952787401 - - 4291486445 - - 3065130626 - - 339152439 - - 324613439 - - 295715991 - - 1514382579 - - 141295447 - - 2854113790 - - 3486452697 - - 2943614740 - - 967539156 - - 739739032 - - 4189158706 - - 2044535010 - - 3663717884 - - 4091214111 - - 3048495520 - - 2714039484 - - 2096892477 - - 3730808838 - - 3127079988 - - 1618267832 - - 2378733912 - - 2777840995 - - 98336120 - - 1935947947 - - 2405621183 - - 3656091141 - - 1191622497 - - 110435588 - - 1328840966 - - 50393462 - - 3153107712 - - 1530157484 - - 4198004043 - - 298062455 - - 423314619 - - 1906537879 - - 1673786658 - - 2088609989 - - 266440734 - - 3805146803 - - 3690103320 - - 4255887021 - - 2944506204 - - 1774803500 - - 2633069177 - - 1241055907 - - 903221398 - - 3356066097 - - 4267758222 - - 2759035733 - - 1601358426 - - 460607005 - - 2585514323 - - 249002466 + - 3441673156 + - 2585233359 + - 939963957 - 1402356663 - - 2145695820 - - 2575541126 - - 3259412568 - - 945746660 - - 932779961 - - 3903083029 - - 3778015260 - - 461244710 - - 2446766495 - - 3107630705 - - 568553271 - - 2453679101 + - 996682802 + - 1442255327 + - 755222564 + - 2003746136 + - 1924824445 + - 471821500 + - 1289424307 + - 1262639923 + - 727009153 + - 3479769255 + - 1708059082 + - 413963702 + - 427098595 + - 2296996310 + - 613479935 + - 3597116301 - 3242843522 - - 539292446 - - 2563511001 - - 2173495465 - - 508817570 - - 455604419 - - 1739812741 - - 3743272667 - - 1066476459 + - 1445053195 + - 3758025916 + - 3705022903 + - 2643461050 + - 3244373986 + - 2475717034 + - 3204490110 + - 1590663081 + - 295715991 + - 2479323017 + - 549644572 - 144545828 - - 639462670 + - 1393544882 + - 2028967550 + - 260126611 + - 2211830179 + - 3733574286 + - 3625815197 + - 945746660 + - 515856748 + - 2535430412 + - 668898046 + - 3131476176 + - 683415129 + - 4256446051 + - 4143788409 + - 568109215 + - 1565660532 + - 2442711850 + - 319164499 + - 1801742725 + - 3949416920 + - 1161533530 + - 55510446 + - 3318418450 + - 3432833699 + - 595190689 + - 38983593 + - 2061972234 + - 953835722 + - 2860681681 + - 2928186292 + - 2322028500 + - 7997109 + - 1155516420 + - 804383039 + - 160427834 + - 1952787401 + - 2748321716 + - 29725303 + - 539292446 + - 1673786658 + - 691240028 + - 1514382579 + - 2457244836 + - 1380049738 + - 2227533092 + - 2563511001 + - 3107630705 + - 1089545938 + - 1618267832 + - 3486452697 + - 967539156 + - 2957995887 + - 297530923 + - 4291486445 + - 324613439 + - 1513082770 + - 1328840966 + - 1935947947 + - 4096724499 + - 2378733912 + - 266440734 + - 4189158706 + - 739739032 + - 141295447 + - 2289169110 + - 3065130626 + - 3730808838 + - 2777840995 + - 2854113790 + - 3770483792 + - 2096892477 + - 3048495520 + - 110435588 + - 98336120 + - 3663717884 + - 2405621183 + - 2714039484 + - 3127079988 + - 1056484837 + - 2453679101 + - 1530157484 + - 3726574861 + - 2048808068 + - 1805023557 From b000e84564d9eef8272970a45bdad7c696f57785 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 27 Apr 2021 14:34:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E8=B6=85=E5=80=BC=E5=9F=BA?= =?UTF-8?q?=E9=87=91=E3=80=91=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=AF?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=20=E4=BF=AE=E6=94=B9=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/MonthRewardPreviewPopup.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua index 978c69b4c4..b809c1adb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthRewardPreviewPopup.lua @@ -31,8 +31,13 @@ end function MonthRewardPreviewPopup:OnOpen(type, goodType) local data = OperatingManager.GetPanelShowReward(type, true,false) - local getDays = OperatingManager.GetRewardDay(goodType) - -- Log("领取天数" .. getDays) + local getDays = 0 + local canBuyNum = OperatingManager.GetLeftBuyTime(goodType, type) + if canBuyNum and canBuyNum <= 0 then + getDays = OperatingManager.GetRewardDay(goodType) + else + getDays = 0 + end for i = 1, #data do if not this.rewardList[i] then this.rewardList[i] = {}