From 4d11ade910a192c64c9eb82d86836316ba9dc006 Mon Sep 17 00:00:00 2001 From: "DESKTOP-98AVA47\\Administrator" <3046463818@qq.com> Date: Fri, 16 Jul 2021 14:09:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E5=85=83=E9=98=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 2 +- .../~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua | 1 + .../~Lua/Modules/Recruit/RecruitMainPanel.lua | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 53ba493f3a..fff1c6428e 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -136,7 +136,7 @@ function this.InitActivityServerData(msg, isUpdate) if not isUpdate then this.mission = {} end - for i, v in ipairs(msg.activityInfo) do + for i, v in ipairs(msg.activityInfo) do this.CheckMoneyProgress(v) this.mission[v.activityId] = v diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua index 932a221c94..588d60ef15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua @@ -27,6 +27,7 @@ function ElementDrawCardPanelNew:InitComponent() self.itemPos[i] = {} self.itemPos[i].pos = Util.GetGameObject(self.transform, "enterCardPanel/itemPos"..i) self.itemPos[i].go = newObjToParent(self.itemPre,self.itemPos[i].pos) + self.itemPos[i].go.name = "itemPre" self.itemPos[i].goImage = self.itemPos[i].go:GetComponent("Image") self.itemPos[i].goImage.sprite = self.spLoader:LoadSprite(PropertyTypeImageBySiYuan[i].Image1) self.itemPos[i].PropertyImage = Util.GetGameObject(self.itemPos[i].go, "Image"):GetComponent("Image") diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua index f1575b282f..d7da6b3baa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua @@ -53,6 +53,7 @@ function RecruitMainPanel:InitComponent() -- end this.pos0 = Vector3.New(this.off * (0 - 2) + (0 - 1) * this.itemWidth - 30,50,0) + --LogGreen("this.pos0:"..tostring(this.pos0)) --this.pos4 = Vector3.New(this.off * (4 - 1) + 4 * this.itemWidth,0,0) self.lastPage,self.curPage,self.nextPage = 0,0,0 @@ -247,10 +248,13 @@ end --界面打开时调用(用于子类重写) function RecruitMainPanel:OnOpen(_index) if not _index then + LogGreen("GuideManager.GetCurId(1):"..tostring(GuideManager.GetCurId(1)).." GuideManager.GetCurId(2):"..tostring(GuideManager.GetCurId(2))) if GuideManager.IsInMainGuide() and GuideManager.GetCurId(1) == 105 then self.CurRecruitId = TableRecruitType.Putong elseif GuideManager.IsInMainGuide() and GuideManager.GetCurId(1) == 1003 then self.CurRecruitId = TableRecruitType.Shenjiang + elseif GuideManager.IsFunctionGuideExist() then + self.CurRecruitId = TableRecruitType.Siyuanzhen else self.CurRecruitId = RecruitManager.CurRecruitId end @@ -311,6 +315,7 @@ function this:RefreshTabData() vec.x = this.off * (i - 2) + (i - 1) * this.itemWidth - 30 vec.y = 50 this.itemList[i].tran.anchoredPosition = vec + --LogGreen("vec:"..i.." "..tostring(vec)) this.itemList[i].pos = this.itemList[i].tran.anchoredPosition this.itemList[i].index = i this.itemList[i].img = Util.GetGameObject(this.itemList[i].go, "img"):GetComponent("Image") @@ -324,6 +329,7 @@ function this:RefreshTabData() end end this.pos4 = Vector3.New(this.off * (#this.itemList - 1) + (#this.itemList) * this.itemWidth - 30,50,0) + --LogGreen("this.pos4:"..tostring(this.pos4)) end function this:SetIndex()