【配置】包配置添加

dev_chengFeng
gaoxin 2021-05-31 17:31:31 +08:00
parent 7f0e97dd32
commit 6b0ff9668d
13 changed files with 247 additions and 15 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 120aef7736d81434485dc4b19ee1bc9a
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: -1
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: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 7c538ffef13c08c4481b90dce394b477
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

Before

Width:  |  Height:  |  Size: 6.9 MiB

After

Width:  |  Height:  |  Size: 6.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 MiB

View File

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

View File

@ -206,6 +206,7 @@ ConfigName = {
WishActivitySetting = "WishActivitySetting",
WishActivityPool = "WishActivityPool",
WishActivityUp = "WishActivityUp",
PackageConfig = "PackageConfig",
}
require "Framework/GameDataBase"

View File

@ -12,6 +12,7 @@ require "Framework/Manager/ServerConfigManager"
require "Data/UIData"
require "Data/SoundData"
require "Data/ConfigData"
require "Framework.Manager.PackageManager"
Framework = { }
@ -91,6 +92,7 @@ function Framework. Initialize()
poolManager = PoolManager:new()
CardRendererManager.Initialize()
ServerConfigManager.Initialize()
PackageManager.Initialize()
UpdateBeat:Add(update, Framework)
end

View File

@ -0,0 +1,28 @@
PackageManager = {}
local this = PackageManager
function PackageManager.Initialize()
this.PackageName = "test"
if AppConst.isSDK then
this.PackageName = AndroidDeviceInfo.Instance:GetPackageName()
end
LogGreen("当前包名为:"..this.PackageName)
local PackagerConfig = ConfigManager.GetConfig(ConfigName.PackageConfig)
for _, config in ConfigPairs(PackagerConfig) do
if config.PackageName == this.PackageName then
this.config = config
end
end
end
-- 获取包名
function PackageManager.GetPackageName()
return this.PackageName
end
-- 获取充值计费点字段
function PackageManager.GetRechargeField()
return this.config.RechargeField
end
-- 获取登录背景图
function PackageManager.GetLoginPanelBg()
return this.config.LoginPanelBg
end

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e1a57571dda0efa48a9b81d655149b23
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -20,15 +20,9 @@ function this.SendCustomEvents(CustomType,info)
if CustomType == configInfo.CustomEventType and (configInfo.value == "0" or info == tonumber(configInfo.value)) then
curConfigData = configInfo
if curConfigData then
if AppConst.SdkPackageName == "com.tcxazcsb.pass" then
--LogGreen("埋点上报数据 成功 "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidTest.." "..curConfigData.Info)
this.SendCustomEvent(curConfigData.tokenAndroidTest,curConfigData.Info,curConfigData.type)
elseif AppConst.SdkPackageName == "com.tcxaz.pass" then
--LogGreen("埋点上报数据 成功 "..AppConst.SdkPackageName.." "..curConfigData.tokenAndroidRelease.." "..curConfigData.Info)
this.SendCustomEvent(curConfigData.tokenAndroidRelease,curConfigData.Info,curConfigData.type)
elseif AppConst.SdkPackageName == "com.tcx.pass" then
--LogGreen("埋点上报数据 成功 "..AppConst.SdkPackageName.." "..curConfigData.tokenIos.." "..curConfigData.Info)
this.SendCustomEvent(curConfigData.tokenIos,curConfigData.Info,curConfigData.type)
local field = PackageManager.GetCustomEventField()
if field and curConfigData[field] and curConfigData[field] ~= "" then
this.SendCustomEvent(curConfigData[field], curConfigData.Info, curConfigData.type)
end
end
end

View File

@ -31,6 +31,11 @@ function this:InitComponent()
this.spLoader = SpriteLoader.New()
orginLayer = 0
this.loginPart = this.gameObject
local bg = Util.GetGameObject(this.gameObject, "bg"):GetComponent("Image")
local bgStr = PackageManager.GetLoginPanelBg()
bg.sprite = this.spLoader:LoadSprite(bgStr)
this.tip = Util.GetGameObject(this.loginPart, "tip/Text")
this.loginAnim = this.gameObject:GetComponent("Animator")

View File

@ -74,12 +74,9 @@ function this.SdkPay(context)
payData.Type = rechargeConfig.Type
-- 判断计费点
if AppConst.SdkPackageName == "com.tcxazcsb.pass" or AppConst.SdkPackageName == "com.tcxaz.pass" then -- 海外GP 测试+正式
payData.RechargeId = rechargeConfig.RechargeId
elseif AppConst.SdkPackageName == "com.jltest.www" then -- 海外Ios测试
payData.RechargeId = rechargeConfig.RechargeId2
elseif AppConst.SdkPackageName == "com.tcxhw.project" then -- 海外Ios正式
payData.RechargeId = rechargeConfig.RechargeId3
local field = PackageManager.GetRechargeField()
if field and rechargeConfig[field] and rechargeConfig[field] ~= "" then
payData.RechargeId = rechargeConfig[field]
else
payData.RechargeId = rechargeConfig.Id
end