From 48a462f37f4a610f611fceadef0621dfc4c28899 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 29 Sep 2020 15:15:58 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=89=93=E7=82=B9=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DataCenterService/CustomEventManager.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index 9f8c2e1167..21706c7dc5 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -21,13 +21,13 @@ if not AppConst.isSDKLogin then return end end end if curConfigData then - if AppConst.SdkPackageName == ConfigManager.GetConfigData(ConfigName.SpecialConfig,68).Key then + if AppConst.SdkPackageName == "com.tcxgpcsb.pass" then LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidTest.." "..curConfigData.Info) this.SendCustomEvent(curConfigData.tokenAndroidTest,curConfigData.Info,curConfigData.type) - elseif AppConst.SdkPackageName == ConfigManager.GetConfigData(ConfigName.SpecialConfig,69).Key then + elseif AppConst.SdkPackageName == "com.tcxgp.pass" then LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidRelease.." "..curConfigData.Info) this.SendCustomEvent(curConfigData.tokenAndroidRelease,curConfigData.Info,curConfigData.type) - elseif AppConst.SdkPackageName == ConfigManager.GetConfigData(ConfigName.SpecialConfig,70).Key then + elseif AppConst.SdkPackageName == "com.tcx.pass" then LogGreen("埋点上报数据 成功 : "..AppConst.SdkPackageName.." "..curConfigData.tokenIos.." "..curConfigData.Info) this.SendCustomEvent(curConfigData.tokenIos,curConfigData.Info,curConfigData.type) end From 42f0f9b5fe691ecc6a6d097c594d98be8e074138 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 30 Sep 2020 10:34:07 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=89=E7=95=8C?= =?UTF-8?q?=E9=99=8D=E9=AD=94=E5=A4=B4=E5=83=8F=E6=A1=86=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/View/ItemView.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 5922088040..cfcdfc1423 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -251,6 +251,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) Util.AddOnceClick(self.frameBtn, function() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) end) + end elseif _itemData.itemType == 2 then --equip @@ -322,6 +323,9 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self:LoadFrameEffect(itemDataConFig.Id, effectRoot) self:SetFrameEffectLayer(effectLayer) self:SetFrameEffectScale(self.scale * 0.7) + Util.AddOnceClick(self.frameBtn, function() + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop) + end) end self.gameObject:GetComponent("RectTransform").localScale = Vector2.New(self.scale, self.scale) end @@ -541,6 +545,9 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self:LoadFrameEffect(itemDataConFig.Id, effectRoot) self:SetFrameEffectLayer(effectLayer) self:SetFrameEffectScale(self.scale * 0.7) + Util.AddOnceClick(self.frameBtn, function() + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,itemSId,nil,self.isRewardItemPop) + end) else --,5随机道具,6符文 self.frame.sprite = Util.LoadSprite(GetQuantityImageByquality(itemConfig[itemSId].Quantity)) From 79309899b0d3a25585a66acfdba6fecc75f929d2 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 30 Sep 2020 11:00:12 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 08c0affdb6..5fcdcf2bd7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -644,6 +644,7 @@ function this.RefreshTreasureLevel(buffer) msg:ParseFromString(data) LogGreen("青龙秘宝等级更新了:"..msg.level) QinglongSerectTreasureManager.SetLevel(msg.level) + QinglongSerectTreasureManager.SetTreasureBuyStatus(msg.hadBuy) QinglongSerectTreasureManager.UpdateTreasureState2() end From bd5d9da3bff78f3d066d5002b3aa783d16d2de84 Mon Sep 17 00:00:00 2001 From: JieLing Date: Wed, 30 Sep 2020 10:58:26 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=88=A4=E6=96=AD=E6=8F=90=E5=AE=A1=E6=9C=8D?= =?UTF-8?q?=E5=92=8C=E6=AD=A3=E5=BC=8F=E6=9C=8D=E8=BF=9B=E8=A1=8C=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=92=8C=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a0a3bf16b6..bc282fe2a8 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -5,7 +5,7 @@ * @Created by MagicianJoker --]] -SERVER_VERSION = 0 +SERVER_VERSION = 1 -- 0 正式服 1 提审服 -- 启用功能引导 ENABLE_FUNC_GUIDE = 1 --0关闭1开启 RECHARGEABLE = true --false不可充值 true可充值 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 82b782cb03..4a5f9631ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -6,7 +6,7 @@ this.LoginWay = { Account = 0, WeChat = 1 } local ServerVersion = SERVER_VERSION -local IsShowNotice = true +local IsShowNotice = SERVER_VERSION == 0 -- 正式服显示公告 local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin local IsDevelopLogin = true diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua index 2466e1fc8e..58f254f71e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingInfo.lua @@ -103,7 +103,7 @@ function SettingInfo:RemoveListener() end --界面打开时调用(用于子类重写) function SettingInfo:OnOpen() - + this.cdKey:SetActive(SERVER_VERSION == 0) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) From a697e3858411507d10560f166afecf04cc5d42e0 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 30 Sep 2020 11:15:56 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index bc282fe2a8..f187afd090 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -5,7 +5,7 @@ * @Created by MagicianJoker --]] -SERVER_VERSION = 1 -- 0 正式服 1 提审服 +SERVER_VERSION = 0 -- 0 正式服 1 提审服 -- 启用功能引导 ENABLE_FUNC_GUIDE = 1 --0关闭1开启 RECHARGEABLE = true --false不可充值 true可充值 From 8b1012892f4e4cd3b438c457e62f781cba96ee7d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 16:31:53 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Mission/QinglongSerectTreasureManager.lua | 1 + Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index e0bc34dbca..1af1ebc46a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -171,6 +171,7 @@ function this.SetLevel(_level) this.level = _level end function this.SetTreasureBuyStatus(hadBuy) + LogBlue("秘宝礼包购买状态:"..hadBuy) this.hadBuyTreasure = (hadBuy == 1) end function this.GetLevel() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 0ea7e2f388..76aaf63ac2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -178,8 +178,9 @@ function this.PlayerInfoRequest(func) -- 试炼副本层级奖励 -- MapTrialManager.InitTrialRewardData(msg.towerReceivedReward) - TreasureOfSomebodyManagerV2.SetCurrentLevel(msg.treasureLevel) - TreasureOfSomebodyManagerV2.SetTreasureBuyStatus(msg.hadBuyTreasure) + -- TreasureOfSomebodyManagerV2.SetCurrentLevel(msg.treasureLevel) + -- LogRed("秘宝礼包购买状态1:"..msg.hadBuyTreasure) + -- TreasureOfSomebodyManagerV2.SetTreasureBuyStatus(msg.hadBuyTreasure) -- 当前波次 MonsterCampManager.monsterWave = msg.monsterAttackTime OperatingManager.SetSignInData(msg.SignInInfo) @@ -208,6 +209,7 @@ function this.PlayerInfoRequest(func) LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime) -- LogGreen("GetPlayerInfoResponse.treasureLevel:"..msg.treasureLevel) QinglongSerectTreasureManager.SetLevel(msg.treasureLevel) + QinglongSerectTreasureManager.SetTreasureBuyStatus(msg.hadBuyTreasure) if func then func(msg) end From 8759e04261841db8b2be51b8833e57c428b6a238 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 16:38:32 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua index b04c464175..32bbc05340 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_QinglongSerectTreasureBuyLevel.lua @@ -73,7 +73,7 @@ function this:Caculate(templv) direct[id] = 0 end direct[id] = direct[id] + num - elseif reward.Reward[j].type == 2 and treasureState > 0 then + elseif reward.Reward[j].type == 2 and treasureState then if not direct[id] then direct[id] = 0 end From 8b75d0a9d1a19c1a65b8a3469e81fa7c5a871126 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 17:16:32 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=99=BE=E5=AE=9D=E5=95=86=E4=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/TreasureStore/TreasureStorePopup.lua | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua index 7bf83a2aee..ff81930902 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua @@ -5,7 +5,6 @@ local this=TreasureStorePopup local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity) local itemsGrid = {} -local isPlayAnim = true function TreasureStorePopup:InitComponent() this.panel=Util.GetGameObject(this.gameObject,"Panel") this.backBtn=Util.GetGameObject(this.panel,"BackBtn") @@ -42,7 +41,6 @@ end function TreasureStorePopup:OnShow() this:RefreshPanel() this:TimeCountDown() - isPlayAnim = true end function TreasureStorePopup:OnClose() @@ -79,10 +77,6 @@ function TreasureStorePopup:RefreshPanel() this:SetScrollPre(go, allData[index]) end) end - if isPlayAnim then - SecTorPlayAnimByScroll(this.scrollView) - isPlayAnim = false - end this.scrollView:SetIndex(1) end @@ -103,11 +97,7 @@ function this.SortData(allData) end --设置每一条 function this:SetScrollPre(root,data) - if isPlayAnim then - root.gameObject:SetActive(false) - else - root.gameObject:SetActive(true) - end + root.gameObject:SetActive(true) local title=Util.GetGameObject(root,"Title"):GetComponent("Text") local iRoot=Util.GetGameObject(root,"ItemRoot") local buyBtn=Util.GetGameObject(root,"BuyBtn") From 7b9a4140f78ba341fffe1dcfe28d7013a00045f0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 18:18:46 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Task/TaskManager.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index e017b2a532..32ffd1da93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -301,9 +301,13 @@ function this.ResetTreasureTaskInfo(taskList) for i = 1, #taskList do local taskInfoList = TypeTaskData[TaskTypeDef.TreasureOfSomeBody] for k = #taskInfoList, 1, -1 do - local taskConfig = ConfigManager.GetConfigData(ConfigName.TreasureSunLongTaskConfig, taskInfoList[k].missionId) - if taskConfig.Type == taskList[i].type then - table.remove(TypeTaskData[TaskTypeDef.TreasureOfSomeBody], k) + if taskInfoList[k].missionId == 0 then + LogRed("服务器传来了id为0的青龙秘宝任务") + else + local taskConfig = ConfigManager.GetConfigData(ConfigName.TreasureSunLongTaskConfig, taskInfoList[k].missionId) + if taskConfig.Type == taskList[i].type then + table.remove(TypeTaskData[TaskTypeDef.TreasureOfSomeBody], k) + end end end table.insert(TypeTaskData[TaskTypeDef.TreasureOfSomeBody], taskList[i].tasks[i]) From 4ba6146a46188b69618f222b5505de7e05360ff4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 21:24:08 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expert/GiftBuy.lua | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua index 439a1f0f35..1c60af61e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua @@ -100,19 +100,12 @@ function this.SingleDataShow(go, data) Util.SetGray(btnBuy, true) end --滚动条复用重设itemview - if itemsGrid[go] then - for i = 1, 4 do - itemsGrid[go][i].gameObject:SetActive(false) - end - for i = 1, #shows do - if itemsGrid[go][i] then - itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) - itemsGrid[go][i].gameObject:SetActive(true) - end - end - else - itemsGrid[go]={} - for i = 1, 4 do + + if not itemsGrid[go] then + itemsGrid[go] = {} + end + for i = 1, #shows do + if not itemsGrid[go][i] then itemsGrid[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform) itemsGrid[go][i].gameObject:SetActive(false) local obj= newObjToParent(shadow,itemsGrid[go][i].transform) @@ -121,11 +114,36 @@ function this.SingleDataShow(go, data) obj:GetComponent("RectTransform").transform.localScale=Vector3.one*1.1 obj.gameObject:SetActive(true) end - for i = 1, #shows do - itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) - itemsGrid[go][i].gameObject:SetActive(true) - end + itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) + itemsGrid[go][i].gameObject:SetActive(true) end + + -- if itemsGrid[go] then + -- for i = 1, 4 do + -- itemsGrid[go][i].gameObject:SetActive(false) + -- end + -- for i = 1, #shows do + -- if itemsGrid[go][i] then + -- itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) + -- itemsGrid[go][i].gameObject:SetActive(true) + -- end + -- end + -- else + -- itemsGrid[go]={} + -- for i = 1, 4 do + -- itemsGrid[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform) + -- itemsGrid[go][i].gameObject:SetActive(false) + -- local obj= newObjToParent(shadow,itemsGrid[go][i].transform) + -- obj.transform:SetAsFirstSibling() + -- obj.transform:DOAnchorPos(Vector3(0,-3,0),0) + -- obj:GetComponent("RectTransform").transform.localScale=Vector3.one*1.1 + -- obj.gameObject:SetActive(true) + -- end + -- for i = 1, #shows do + -- itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) + -- itemsGrid[go][i].gameObject:SetActive(true) + -- end + -- end --local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FINDTREASURE_GIFT, data.id, 1) Util.AddOnceClick(btnBuy, function() if shopItemData.Limit <= boughtNum then From 3deee8077931433fd183b96c848866bc9e1f98f1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 15 Oct 2020 21:28:23 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8A=A2=E8=B4=AD?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua index 1c60af61e3..8fc06f6a2c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua @@ -104,6 +104,9 @@ function this.SingleDataShow(go, data) if not itemsGrid[go] then itemsGrid[go] = {} end + for k,v in pairs(itemsGrid[go]) do + v.gameObject:SetActive(false) + end for i = 1, #shows do if not itemsGrid[go][i] then itemsGrid[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform) @@ -117,7 +120,6 @@ function this.SingleDataShow(go, data) itemsGrid[go][i]:OnOpen(false, {shows[i][1],shows[i][2]}, 0.9,false,false,false,cursortingOrder) itemsGrid[go][i].gameObject:SetActive(true) end - -- if itemsGrid[go] then -- for i = 1, 4 do -- itemsGrid[go][i].gameObject:SetActive(false)