diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua index f6154e5851..9d61a406fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua @@ -135,7 +135,7 @@ function DemonSlayerPanel:SetRank(ActInfo) --加载立绘 npc = allRankData[i].sex == ROLE_SEX.BOY and mapNpc or mapNpc2 - local scale = allRankData[i].sex == ROLE_SEX.BOY and Vector3.one * 0.45 or Vector3.one * 0.35 + local scale = allRankData[i].sex == ROLE_SEX.BOY and Vector3.one * 0.45 or Vector3.one * 0.25 npcList[i] = poolManager:LoadLive(npc, livePrefab.transform, scale, Vector3.New(0,-158.31,0)) local SkeletonGraphic = npcList[i]:GetComponent("SkeletonGraphic") if SkeletonGraphic then diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua index 764512f114..eaeba1af5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua @@ -80,6 +80,7 @@ end --- 关闭界面事件 function this.OnCloseBtnClick() + this.root.tip:SetActive(false) this.root:ClosePanel() end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index d13be76492..89efdcd014 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -99,7 +99,7 @@ function GrowthGiftPage:RefreshShowData(item, data) local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)--当前礼包奖励的活动类型(6\7\8\9\16)(成长礼包的不同档位奖励ActivityId不同,虽然同为成长基金) local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, data.Id)--获取活动数据 self.context.Id - local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)--当前礼包ID(101\102\103\104\105) + local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1])--当前礼包ID(101\102\103\104\105) local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward) --item local shadow = Util.GetGameObject(item, "shadow") diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua index 27cd4f8171..9d78176fab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua @@ -43,7 +43,7 @@ function GrowthGiftTaskItem:OnSortingOrderChange(cursortingOrder) end function GrowthGiftTaskItem:SetValue() local activityInfo = ActivityGiftManager.GetActivityInfo(GrowthRewardId, self.context.Id)--获取活动数据 self.context.Id - local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)--判断当前礼包是否已投资 + local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1])--判断当前礼包是否已投资 if activityInfo then self.state = activityInfo.state @@ -81,7 +81,7 @@ end function GrowthGiftTaskItem:OnBtnDealClicked() local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward) - local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId) + local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1]) if not openStatus or (goods and goods.buyTimes < 1) then PopupTipPanel.ShowTip(Language[11474]) return diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 28dea2b422..376538015e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -1096,6 +1096,7 @@ function RoleInfoPanel:OnClickBtnInfo() --Log("情 报 情 报 情 报") RoleInfoPanel.HideAllLayout() this.roleInfoLayout:SetActive(true) + this.talentTipStrGo:SetActive(false) RoleInfoPanel:SetSelectBtn(self.btnInfo, Language[11836]) end --进阶按钮点击 @@ -1106,6 +1107,7 @@ function RoleInfoPanel:OnClickBtnUpStar() end RoleInfoPanel.HideAllLayout() this.roleUpStarLayout:SetActive(true) + this.talentTipStrGo:SetActive(true) RoleInfoPanel:SetSelectBtn(self.btnUpStar, Language[11845]) end --跳转直接到进阶界面