diff --git a/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png b/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png new file mode 100644 index 0000000000..8e3eda90aa Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png.meta new file mode 100644 index 0000000000..4ac4e9d65e --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d83acbcc410aa1a4296fcca0d042782b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 361521058ee28b6489e6a329c147bedf + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index eee539a59a..757962c720 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1603,6 +1603,7 @@ GoodsTypeDef = { chaozhifanli = 18, GMJustBuy =20, HHBG=22,--无限资源阁 + DJQ =63, --代金券 } --工坊功能类型 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua index 961fd22bbe..f8022b70ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/FaLingManager.lua @@ -95,9 +95,9 @@ function this.GetCanBlessEquipList() end table.sort(list,function(a,b) if a.lv==b.lv then - return a.lv > b.lv + return a.staticId > b.staticId else - return a.staticId > b.staticId + return a.lv > b.lv end end) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index 1a1bc9517b..652c49a340 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -448,11 +448,16 @@ function GiftPre:SetIsCanBuy() end if isCanBuy == 0 then - --LogError("self.data.data.limitNum=="..self.data.data.limitNum.." self.data.data.boughtNum=="..self.data.data.boughtNum) - isCanBuy = (self.data.data.limitNum - self.data.data.boughtNum > 0) and 0 or 2 - if self.data.data.linkAct then - isCanBuy = self.data.data.state == 0 and 0 or 2 + LogError("self.data.data.limitNum=="..self.data.data.limitNum.." self.data.data.boughtNum=="..self.data.data.boughtNum) + if self.data.data.limitNum==0 then + isCanBuy=0 + else + isCanBuy = (self.data.data.limitNum - self.data.data.boughtNum > 0) and 0 or 2 + if self.data.data.linkAct then + isCanBuy = self.data.data.state == 0 and 0 or 2 + end end + end if isCanBuy == 0 then self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_slbz_1anniuongse") diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 696d1937ce..925b42b6dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -66,7 +66,12 @@ end function RechargeViewNew:OnShow(_sortingOrder) self.gameObject:SetActive(true) self.sortingOrder = _sortingOrder - self.shopView:ShowShop(SHOP_TYPE.SOUL_STONE_SHOP, self.sortingOrder) + LogError("self.actConfig============="..self.actConfig.ShopData[1][3]) + local showType=3 + if self.actConfig.ShopData and #self.actConfig.ShopData>0 then + showType=self.actConfig.ShopData[1][3] + end + self.shopView:ShowShop(SHOP_TYPE.SOUL_STONE_SHOP, self.sortingOrder,showType) self:SetGrowGift() end diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index a23f4d4c5e..122926cd7f 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -1,5 +1,6 @@ local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig) +local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) -- 通用得商店逻辑 local ShopView = {} local this = ShopView @@ -215,7 +216,11 @@ end -- 刷新商店内容显示 function this:RefreshShopInfo(isRefresh, isTop,isAni) if self.ShopType == SHOP_TYPE.SOUL_STONE_SHOP then - self.RechargeShopData = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DemonCrystal) + if self.showType and self.showType~=0 then + LogError("slef.shwotype=========================="..self.showType) + self.RechargeShopData = OperatingManager.GetGiftGoodsInfoList(self.showType) + end + else self.ShopData = ShopManager.GetShopDataByType(self.ShopType) end @@ -426,6 +431,7 @@ function this:RefreshItemList(isRefresh,isTop,isAni) self.ScrollView.gameObject:SetActive(false) self.RechargeScrollView.gameObject:SetActive(true) local itemlist = self.RechargeShopData + LogError("#itemlist================================"..#itemlist) self.RechargeScrollView:SetData(itemlist, function(index, shopItem) local itemData = itemlist[index] self:RechargeShopItemAdapter(shopItem, itemData) @@ -646,16 +652,30 @@ end function this:RechargeShopItemAdapter(shopItem, itemData) -- 获取对象 local first = Util.GetGameObject(shopItem, "first") + local firstImg=Util.GetGameObject(shopItem, "first"):GetComponent("Image") local firstNum = Util.GetGameObject(shopItem, "first/Text"):GetComponent("Text") local xuChong = Util.GetGameObject(shopItem, "xuChong") local xuNum = Util.GetGameObject(shopItem, "xuChong/Text"):GetComponent("Text") local icon = Util.GetGameObject(shopItem, "icon"):GetComponent("Image") local num = Util.GetGameObject(shopItem, "itemNum"):GetComponent("Text") + local itemIcon=Util.GetGameObject(shopItem, "itemIcon"):GetComponent("Image") local price = Util.GetGameObject(shopItem, "price/Text"):GetComponent("Text") - + + -- 计算数据 + local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId) - icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemInfo.Resources)) + local baseId=itemInfo.BaseReward[1][1] + local costStr=GetResourcePath(itemConfig[baseId].ResourceID) + itemIcon.sprite=self.spLoader:LoadSprite(costStr) + if self.showType==63 then + firstImg.sprite=self.spLoader:LoadSprite("s_shangcheng_shouchong_djq_zh") + icon.sprite = self.spLoader:LoadSprite(costStr) + else + firstImg.sprite=self.spLoader:LoadSprite("s_shangcheng_shouchong_zh") + icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemInfo.Resources)) + end + num.text = itemInfo.BaseReward[1][2] price.text = MoneyUtil.GetMoneyUnitNameWithMoney(itemInfo.Price) --.. MoneyUtil.GetMoney(itemInfo.Price) @@ -691,7 +711,7 @@ end ---=====================================对外接口=============================---- -- 设置要显示的商店类型 -function this:ShowShop(shopType,_sortingOrder) +function this:ShowShop(shopType,_sortingOrder,_showType) self.ScrollView:ForeachItemGO(function (index, go) go.gameObject:SetActive(false) end) @@ -717,6 +737,7 @@ function this:ShowShop(shopType,_sortingOrder) -- 刷新显示 self.ShopType = shopType + self.showType = _showType isPlayShow = true self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id self.ShopConfig = _ShopTypeConfig[self.ShopId]