diff --git a/Assets/LuaFramework/GameIcon/icon_xipu.png b/Assets/LuaFramework/GameIcon/icon_xipu.png new file mode 100644 index 0000000000..3f655a9cb8 Binary files /dev/null and b/Assets/LuaFramework/GameIcon/icon_xipu.png differ diff --git a/Assets/LuaFramework/GameIcon/icon_xipu.png.meta b/Assets/LuaFramework/GameIcon/icon_xipu.png.meta new file mode 100644 index 0000000000..862576189c --- /dev/null +++ b/Assets/LuaFramework/GameIcon/icon_xipu.png.meta @@ -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: diff --git a/Assets/ManagedResources/BG/dl_ui_effect_bg.png b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png similarity index 100% rename from Assets/ManagedResources/BG/dl_ui_effect_bg.png rename to Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png diff --git a/Assets/ManagedResources/BG/dl_ui_effect_bg.png.meta b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta similarity index 100% rename from Assets/ManagedResources/BG/dl_ui_effect_bg.png.meta rename to Assets/ManagedResources/BG/Login/dl_ui_effect_bg.png.meta diff --git a/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg new file mode 100644 index 0000000000..d4e1b46542 Binary files /dev/null and b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg differ diff --git a/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg.meta b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg.meta new file mode 100644 index 0000000000..dba1e313bd --- /dev/null +++ b/Assets/ManagedResources/BG/Login/dl_ui_effect_bg_xipu.jpg.meta @@ -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: diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index 316b8f3f12..7e3b60efe8 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -206,6 +206,7 @@ ConfigName = { WishActivitySetting = "WishActivitySetting", WishActivityPool = "WishActivityPool", WishActivityUp = "WishActivityUp", + PackageConfig = "PackageConfig", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Framework/Framework.lua b/Assets/ManagedResources/~Lua/Framework/Framework.lua index 0b4d28959f..c6c032ab3d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Framework.lua +++ b/Assets/ManagedResources/~Lua/Framework/Framework.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua new file mode 100644 index 0000000000..24f65819a0 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -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 \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua.meta b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua.meta new file mode 100644 index 0000000000..ac1beb447b --- /dev/null +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e1a57571dda0efa48a9b81d655149b23 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua index 3a71d915e0..b908b8b8b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/CustomEventManager.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index fb80c16ac6..e816dc0d51 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -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") diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index f1a5c2dbac..302253bcd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -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