Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-03-18 15:15:32 +08:00
commit f8d0c03e63
5 changed files with 70 additions and 16 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.7 MiB

View File

@ -1,7 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4528569438bc7614e88c1a8f819e698a guid: 4528569438bc7614e88c1a8f819e698a
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName:
21300000: b_baridenglu_slogan08_4geren
externalObjects: {} externalObjects: {}
serializedVersion: 9 serializedVersion: 9
mipmaps: mipmaps:
@ -40,7 +41,7 @@ TextureImporter:
nPOTScale: 0 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 1 spriteMode: 2
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@ -69,9 +70,62 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites:
- serializedVersion: 2
name: b_baridenglu_slogan08_4geren
rect:
serializedVersion: 2
x: 0
y: 0
width: 1082
height: 1224
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: -1
bones: []
spriteID: c361b7ef30ff80a4eb4f739403cff7c9
vertices: []
indices:
edges: []
weights: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
@ -80,7 +134,7 @@ TextureImporter:
indices: indices:
edges: [] edges: []
weights: [] weights: []
spritePackingTag: EightDayAtlas spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
userData: userData:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 KiB

After

Width:  |  Height:  |  Size: 556 KiB

View File

@ -412,18 +412,18 @@ function this.CheckNewVipRP()
end end
function this.CheckGrowthPackagePointStatus()--成长礼包 function this.CheckGrowthPackagePointStatus()--成长礼包
-- local redointTime =PlayerPrefs.GetInt(PlayerManager.uid.."czlb", 0) local redointTime =PlayerPrefs.GetInt(PlayerManager.uid.."czlb", 0)
-- local rechargeNum= VipManager.GetChargedNum()--已经充值的金额 local rechargeNum= VipManager.GetChargedNum()--已经充值的金额
-- local shopData = ShopManager.GetShopDataByType(SHOP_TYPE.VIP_GIFT).storeItem local shopData = ShopManager.GetShopDataByType(SHOP_TYPE.VIP_GIFT).storeItem
-- local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig)
-- for i = 1, #shopData do for i = 1, #shopData do
-- local boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.VIP_GIFT, shopData[i].id) local boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.VIP_GIFT, shopData[i].id)
-- if rechargeNum >= shopItemConfig[shopData[i].id].BuyRule[2] and boughtNum == 0 then if rechargeNum >= shopItemConfig[shopData[i].id].BuyRule[2] and boughtNum == 0 then
-- if redointTime == 0 then if redointTime == 0 then
-- return true return true
-- end end
-- end end
-- end end
return false return false
end end