From 4cbb65c73baaeddb0450e1f5c2aef5eee0333293 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 27 Apr 2021 17:53:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E8=B6=85=E5=80=BC=E5=9F=BA?= =?UTF-8?q?=E9=87=91=E3=80=91=E4=B9=B0=E4=B8=A4=E6=AC=A1=20=E5=B0=9D?= =?UTF-8?q?=E8=AF=95=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/UppperMonthCard.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 1125c1d405..39d6515c70 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -72,11 +72,11 @@ end --绑定事件(用于子类重写) function UpperMonthCard:BindEvent() - Util.AddClick(self.btnPreview, function() + Util.AddOnceClick(self.btnPreview, function() UIManager.OpenPanel(UIName.MonthRewardPreviewPopup, self.baseType, self.chargerBaseType) end) - Util.AddClick(self.btnBuy, function() + Util.AddOnceClick(self.btnBuy, function() local isActive = VipManager.GetMonthCardOpenState() if not isActive then MsgPanel.ShowTwo(Language[11387], function() From f20c58dc9607139552c8f89cc206bf9ad353e545 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 27 Apr 2021 17:56:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E6=8F=B4?= =?UTF-8?q?=E5=8A=A9=E3=80=91=20=E6=AF=8F=E6=AC=A1=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8F=B4=E5=8A=A9=EF=BC=8C=E5=88=97=E8=A1=A8=E9=83=BD=E4=BC=9A?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BD=AE=E9=A1=B6=E6=98=BE=E7=A4=BA----3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recharge/View/EveryDayGift.lua | 9 +++++++-- Assets/ManagedResources/~Lua/View/ScrollCycleView.lua | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua index 4594376216..ec36512dd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua @@ -121,6 +121,7 @@ function EveryDayGift:OnShow(_sortingOrder) self.titleTip.gameObject:SetActive(true) else self.titleTip.gameObject:SetActive(false) + end if self.actConfig.Id == 63 then @@ -163,6 +164,7 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) if self.shopData[i].DataType == DynamicActivityManager.selectIndex.dataType then for j = 1 , #DynamicActivityManager.selectIndex.goodsId do if (self.shopData[i].data.shopData.id or self.shopData[i].data.shopData.goodsId) == DynamicActivityManager.selectIndex.goodsId[j] then + DynamicActivityManager.SetSelectIndex(0,{}) curindex = i break end @@ -172,8 +174,11 @@ function EveryDayGift:RefreshGiftData(isTop,isAni) break end end - --LogGreen("curindex:"..curindex) - self.scrollView:SetIndex(curindex) + if curindex ~= 0 then + --LogGreen("curindex:"..curindex) + self.scrollView:SetIndex(curindex) + end + end function EveryDayGift:isBought() diff --git a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua index 1928336a91..b1bb92ae1e 100644 --- a/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua +++ b/Assets/ManagedResources/~Lua/View/ScrollCycleView.lua @@ -322,9 +322,10 @@ function this:SetData(dataList, updateFunc, noTop, noAnim) -- 判断是否回到顶部,否则保持不动 if noTop then local oldPosY = self.dragGOTran.anchoredPosition.y + local oldPosX = self.dragGOTran.anchoredPosition.x local showIndex = self:CalShowIndex() self:SetShow(showIndex) - self.dragGOTran.anchoredPosition = Vector2.New(0, oldPosY) + self.dragGOTran.anchoredPosition = Vector2.New(oldPosX, oldPosY) else self:SetShow(1) end From 68626e287ec2271bdbd63c9d0f5e33ad753dafa3 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 27 Apr 2021 18:02:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E8=B8=8F=E7=A2=8E=E5=87=8C?= =?UTF-8?q?=E9=9C=84=E3=80=91=E5=A5=96=E5=8A=B1=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 9fd73cc795..21e13631c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -96,6 +96,14 @@ local TypeUpdateFunc = { end end end + + table.sort(curData.rewards,function (a,b) + if a.state == b.state then + return a.missionId < b.missionId + else + return a.state < b.state + end + end) end } From a5b8dc1de9f1ed206e82f0893fc99898554b27a7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 27 Apr 2021 18:16:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90Log=E3=80=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=81=9C=E4=B8=8D=E4=B8=8B=E6=9D=A5=E7=9A=84?= =?UTF-8?q?Log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua index 45ec0ab1b3..2d0259eb33 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Logic/TileMapView.lua @@ -458,9 +458,9 @@ end --矩形排列算法(以左上角为原点建立u,v坐标) function this.DrawTilePos(u, v) - print(_offsetAngle) - print(_offsetAngleValue) - print(_tileSize.x, _tileSize.y) + -- print(_offsetAngle) + -- print(_offsetAngleValue) + -- print(_tileSize.x, _tileSize.y) return Quaternion.Euler(0,0, _offsetAngle) * Vector3.New(u * _tileSize.x, v * -_tileSize.y, 0) * _offsetAngleValue end