[福利]红包修改提交
parent
8e1d427e2a
commit
347341ca02
Binary file not shown.
After Width: | Height: | Size: 296 KiB |
|
@ -0,0 +1,110 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1c8cc535a08edba4781eb20e24b12de5
|
||||||
|
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: 56
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 1
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
- 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: 1eb0edf83499e6d439e5c249d9018c3b
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: TimeLimitUpHero
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -51,7 +51,7 @@ function GuildCreatePopup:BindEvent()
|
||||||
end
|
end
|
||||||
GuildManager.RequestCreateGuild(name, announce, function()
|
GuildManager.RequestCreateGuild(name, announce, function()
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
NetManager.RequestWelfareRedPacket()
|
NetManager.RequestRedPacketData()
|
||||||
if this.successFunc then this.successFunc() end
|
if this.successFunc then this.successFunc() end
|
||||||
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
UIManager.OpenPanel(UIName.GuildMainCityPanel)
|
||||||
PopupTipPanel.ShowTip(Language[10847])
|
PopupTipPanel.ShowTip(Language[10847])
|
||||||
|
|
|
@ -184,7 +184,7 @@ function MyGuildManager.ReuqsetRedPackage(func)
|
||||||
end
|
end
|
||||||
this.PackageNum=num
|
this.PackageNum=num
|
||||||
CheckRedPointStatus(RedPointType.Guid_GetPackage)
|
CheckRedPointStatus(RedPointType.Guid_GetPackage)
|
||||||
CheckRedPointStatus(RedPointType.Guid_GetPackage)
|
CheckRedPointStatus(RedPointType.Guid_SendPackage)
|
||||||
CheckRedPointStatus(RedPointType.Guild_RedPacket)
|
CheckRedPointStatus(RedPointType.Guild_RedPacket)
|
||||||
if func then
|
if func then
|
||||||
func(msg)
|
func(msg)
|
||||||
|
|
|
@ -181,6 +181,7 @@ function this:SetView(root,data)
|
||||||
PopupTipPanel.ShowTip(string.format(Language[11046],itemName,count))
|
PopupTipPanel.ShowTip(string.format(Language[11046],itemName,count))
|
||||||
MyGuildManager.ReuqsetRedPackage(function()
|
MyGuildManager.ReuqsetRedPackage(function()
|
||||||
CheckRedPointStatus(RedPointType.Guid_GetPackage)
|
CheckRedPointStatus(RedPointType.Guid_GetPackage)
|
||||||
|
CheckRedPointStatus(RedPointType.Guild_RedPacket)
|
||||||
end)
|
end)
|
||||||
else--抢红包失败
|
else--抢红包失败
|
||||||
PopupTipPanel.ShowTip(Language[11047])
|
PopupTipPanel.ShowTip(Language[11047])
|
||||||
|
|
|
@ -469,7 +469,7 @@ function this.ExecuteLoading()
|
||||||
function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end,
|
function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end,
|
||||||
function() NetManager.HardStageRequest(LoadingPanel.OnStep) end,
|
function() NetManager.HardStageRequest(LoadingPanel.OnStep) end,
|
||||||
function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end,
|
function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end,
|
||||||
function() NetManager.RequestWelfareRedPacket(LoadingPanel.OnStep) end,
|
function() NetManager.RequestRedPacketData(LoadingPanel.OnStep) end,
|
||||||
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
|
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||||
-- 登录成功确认
|
-- 登录成功确认
|
||||||
NetManager.LoginConfimRequest()
|
NetManager.LoginConfimRequest()
|
||||||
|
|
|
@ -146,6 +146,7 @@ function this.WelfareRedPacketPush(buffer)
|
||||||
if msg.redpacket then
|
if msg.redpacket then
|
||||||
MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
|
MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
|
||||||
CheckRedPointStatus(RedPointType.Guid_SendPackage)
|
CheckRedPointStatus(RedPointType.Guid_SendPackage)
|
||||||
|
CheckRedPointStatus(RedPointType.Guid_GetPackage)
|
||||||
end
|
end
|
||||||
-- BagManager.BagIndicationRefresh(msg)
|
-- BagManager.BagIndicationRefresh(msg)
|
||||||
end
|
end
|
||||||
|
|
|
@ -2531,7 +2531,7 @@ function this.RequestWelfareRedPacket(_id,func)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 登陆请求福利红包数据
|
-- 登陆请求福利红包数据
|
||||||
function this.RequestWelfareRedPacket(func)
|
function this.RequestRedPacketData(func)
|
||||||
local data = PlayerInfoProto_pb.WelfareRedPacketRequest()
|
local data = PlayerInfoProto_pb.WelfareRedPacketRequest()
|
||||||
local msg = data:SerializeToString()
|
local msg = data:SerializeToString()
|
||||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, msg, function(buffer)
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, msg, function(buffer)
|
||||||
|
|
Loading…
Reference in New Issue