diff --git a/Assets/ManagedResources/BGNC/loading_caohua.png b/Assets/ManagedResources/BGNC/loading_caohua.png new file mode 100644 index 0000000000..438dbdff2d Binary files /dev/null and b/Assets/ManagedResources/BGNC/loading_caohua.png differ diff --git a/Assets/ManagedResources/BGNC/loading_caohua.png.meta b/Assets/ManagedResources/BGNC/loading_caohua.png.meta new file mode 100644 index 0000000000..599540949d --- /dev/null +++ b/Assets/ManagedResources/BGNC/loading_caohua.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 78146d0f3acbb8a4bb03edb82f7103c8 +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 + - 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 12c071fcc561e2e4e9c27cc698ceca2b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/login_caohua.png b/Assets/ManagedResources/BGNC/login_caohua.png new file mode 100644 index 0000000000..2ef797f0a0 Binary files /dev/null and b/Assets/ManagedResources/BGNC/login_caohua.png differ diff --git a/Assets/ManagedResources/BGNC/login_caohua.png.meta b/Assets/ManagedResources/BGNC/login_caohua.png.meta new file mode 100644 index 0000000000..dd0c2a619f --- /dev/null +++ b/Assets/ManagedResources/BGNC/login_caohua.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 991f9c9f706428f458fe1a0d7ecd44fd +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 + - 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5ba80d7b3b110014da6b2541a8aeeb4a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BGNC/logo_caohua.png b/Assets/ManagedResources/BGNC/logo_caohua.png new file mode 100644 index 0000000000..a609b9219e Binary files /dev/null and b/Assets/ManagedResources/BGNC/logo_caohua.png differ diff --git a/Assets/ManagedResources/BGNC/logo_caohua.png.meta b/Assets/ManagedResources/BGNC/logo_caohua.png.meta new file mode 100644 index 0000000000..0ccee821d4 --- /dev/null +++ b/Assets/ManagedResources/BGNC/logo_caohua.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ede61ad7530ff1e4ea4a1f78ae0540a9 +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 + - 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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0a68df33e0b770c428513dc4207fd636 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua index 97d793cecd..760c557b44 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua @@ -31,7 +31,6 @@ end --绑定事件(用于子类重写) function UpStarPre:BindEvent() Util.AddOnceClick(self.btnBuy.gameObject, function() - LogGreen("self.data.state:"..self.data.state) if self.data.state == 0 then PopupTipPanel.ShowTip("神将达指定星级后解锁") return @@ -51,46 +50,6 @@ function UpStarPre:BindEvent() end) end ---购买点击事件 -function UpStarPre:BuyAction(costId, costNum, shopType, itemId) - local haveNum = BagManager.GetItemCountById(costId) - local costName = ConfigManager.GetConfigData(ConfigName.ItemConfig, costId).Name - --Log("需要消耗的道具ID" .. costId) - if haveNum < costNum then - NotEnoughPopup:Show(costId) - else - local func = function(shopType, itemId) - ShopManager.RequestBuyShopItem(shopType, itemId, 1, function() - self.parent:RefreshData(nil,false,false) - CheckRedPointStatus(RedPointType.DailyGift) - CheckRedPointStatus(RedPointType.GrowthPackage) - if shopType==20 and (itemId==1107 or itemId==1110 or itemId==1111 or itemId==1108 )then - PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666) - end - end) - end - local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. shopType) - local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) - if (isPopUp ~= currentTime and costNum ~= 0) then - local str = string.format(Language[11360], costNum, costName) - MsgPanel.ShowTwo(str, function() - end, function(isShow) - if (isShow) then - local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) - RedPointManager.PlayerPrefsSetStr(PlayerManager.uid .. shopType, currentTime) - end - func(shopType, itemId) - end, - Language[10731], - Language[10732], - nil, - true) - else - func(shopType, itemId) - end - end -end - --添加事件监听(用于子类重写) function UpStarPre:AddListener() end @@ -180,7 +139,7 @@ function UpStarPre:SetBtn() self.price.text = MoneyUtil.GetMoneyUnitNameWithMoney(self.data.giftConfig.Price) self.buyInfo.text = string.format("限购%s次",self.data.giftConfig.Limit) - if self.data.giftData.buyTimes > 0 then + if self.data.giftData and self.data.giftData.buyTimes > 0 then self.buyInfo.text = "" self.price.text = "已购买" self.btnBuy.enabled = false