dev_chengFeng
2han9B1a0 2020-07-09 11:52:40 +08:00
parent 3e43ea4876
commit 47b34f9d6e
8 changed files with 1352 additions and 142 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 744db3b7c7c89dd42895fdd897d16a4b
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: 65
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: 7ff646290b1e9d1418c70cfc9e80b7c5
vertices: []
indices:
edges: []
weights: []
spritePackingTag: QianKunBox
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: b85dd88e0cd7f524fa4534bf0769a5a6
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: 65
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: 0ab4a56e089f3c04686d25bbefd84faf
vertices: []
indices:
edges: []
weights: []
spritePackingTag: QianKunBox
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -475,6 +475,7 @@ SHOP_PAGE = {
PLAY = 4, -- 玩法
EXCHANGE = 5, -- 兑换
ROAM = 6, -- 云游
SOULBOX = 7, -- 宝囊
}
SHOP_TYPE = {
SOUL_CONTRACT_SHOP = 1, -- 契魂商店
@ -625,6 +626,7 @@ RedPointType = {
Shop_Arena_Check = 253300,
Shop_Guild_Check = 253310,
Shop_Roam_Check = 253500,
Shop_SoulBox_Check = 254000,
--- 特权红点
VIP_SHOP_DETAIL = 10086, -- 特权详情按钮

View File

@ -1,6 +1,10 @@
local QianKunBox = quick_class("QianKunBox")
local ActivityDetail = require("Modules/Operating/ActivityDetail")--活动详情
local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardConfig,"Pool",4401)
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
function QianKunBox:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
self.gameObject = gameObject
@ -21,6 +25,7 @@ function QianKunBox:InitComponent(gameObject)
self.btnStore = Util.GetGameObject(self.rightUp,"store")
--center
self.center = Util.GetGameObject(gameObject,"center")
self.icons = Util.GetGameObject(self.center,"icons")
--bottom
self.bottom = Util.GetGameObject(gameObject,"bottom")
self.btnOne = Util.GetGameObject(self.bottom,"btnOne")
@ -59,6 +64,20 @@ function QianKunBox:OnShow()
self.gameObject:SetActive(true)
self.btnTen2:SetActive(BagManager.GetItemCountById(16)>=2000)
self.btnTen1:SetActive(BagManager.GetItemCountById(16)<2000)
for i = 1, 5 do
local icon = Util.GetGameObject(self.icons,"icon"..i.."/icon"):GetComponent("Image")
local kuang = Util.GetGameObject(self.icons,"icon"..i.."/kuang"):GetComponent("Image")
local name = artConfig[itemConfig[iconsData[i].Reward[1]].ResourceID].Name
icon.sprite = Util.LoadSprite(name)
if itemConfig[iconsData[i].Reward[1]].Quantity == 5 then--金色
kuang.sprite = Util.LoadSprite("r_hunyin_hunyinkuanghuang001")
end
Util.AddOnceClick(kuang.gameObject,function ()
UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,iconsData[i].Reward[1],nil,nil)
end)
end
end
function QianKunBox:OnHide()

View File

@ -33,6 +33,10 @@ local _ShopPage = {
default = "r_shop_yunyou_01", lock = "r_shop_yunyou_01", select = "r_shop_yunyou_02",
rpType = RedPointType.Shop_Page_Roam,
},
-- [SHOP_PAGE.SOULBOX] = { -- 宝囊
-- default = "x_xianshishangshi_anniu_01", lock = "x_xianshishangshi_anniu_01", select = "x_xianshishangshi_anniu_02",
-- rpType = RedPointType.Shop_SoulBox_Check,
-- },
}
this._MainShopPageList = {}