From 93b383972744d7d540699d0de8905f09fd2c00bd Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 23 Sep 2021 16:46:35 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E5=95=86=E5=BA=97=E5=88=B7=E6=96=B0=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Ranking/RankingSingleListPanel.prefab | 2 +- .../~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Shop/ShopManager.lua | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab index a75b02f552..ac32d8abea 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingSingleListPanel.prefab @@ -1539,7 +1539,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000006914139, y: 0.0000021457672} + m_AnchoredPosition: {x: -0.000006914139, y: -12} m_SizeDelta: {x: 300.59998, y: 41.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7897235475359925225 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 0c9ab50369..27b4ae71fe 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -604,6 +604,7 @@ SHOP_TYPE = { CHIZHANFENGYUN_SHOP = 74,--叱咤风云商店 SHIBUKEDANG_SHOP = 75,--势不可挡商店 XUANJIMIAOSUAN_SHOP = 76,--旋即妙算商店 + QIJIE_SHOP = 81,--七界商店 } PropertyTypeIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua index aa91dcd437..6801defabc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua @@ -75,12 +75,14 @@ function this.ReceiveShopData(msg) -- 更新事件 Game.GlobalEvent:DispatchEvent(GameEvent.Shop.OnShopInfoChange) - --for _, shopData in ipairs(this.allShopData) do - -- Log( "商店id = " .. shopData.id) - -- for _, v in ipairs(shopData.storeItem) do - -- Log(v.id .."::::::::::" .. v.buyNum) - -- end - --end + for _, shopData in ipairs(this.allShopData) do + local name = ConfigManager.GetConfigDataByKey(ConfigName.StoreTypeConfig,"Id",shopData.id).Name + Log("商店名称:"..tostring(name).."商店id:"..shopData.id.." 结束时间："..tostring(TimeStampToDateStr(shopData.endTime/1000)).. + " 上次刷新时间："..tostring(TimeStampToDateStr(shopData.lastRefreshTime/1000))) + -- for _, v in ipairs(shopData.storeItem) do + -- Log("商品Id:"..v.id .." 购买次数:" .. v.buyNum) + -- end + end end -- 更新商店数据 @@ -746,7 +748,7 @@ function this.CountShopRefreshLeftTime(shopId) --- 按时间长度刷新 elseif shopInfo.RefreshType[1] == 3 then local shopData = this.GetShopDataByType(shopType) - if shopType == 12 then + if shopType == SHOP_TYPE.GUILD_SHOP or shopType == SHOP_TYPE.QIJIE_SHOP then local lastRefreshTime = shopData.lastRefreshTime / 1000 local deltaSeconds = shopInfo.RefreshType[2] * 60 * 60 local lastTime = lastRefreshTime + deltaSeconds - GetTimeStamp()