Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
f1b5b0a97f
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:
|
|
@ -17646,8 +17646,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: -48.012}
|
m_AnchoredPosition: {x: 0, y: -16.7}
|
||||||
m_SizeDelta: {x: 935, y: 1132.164}
|
m_SizeDelta: {x: 935, y: 1297.2}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &6290182382149610470
|
--- !u!114 &6290182382149610470
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -18801,8 +18801,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 37.349987}
|
||||||
m_SizeDelta: {x: 935, y: 1250}
|
m_SizeDelta: {x: 935, y: 1405.3}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &493147932202940922
|
--- !u!222 &493147932202940922
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -21728,7 +21728,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -467.5, y: 566.08203}
|
m_AnchoredPosition: {x: -467.5, y: 648.6}
|
||||||
m_SizeDelta: {x: 935, y: 0}
|
m_SizeDelta: {x: 935, y: 0}
|
||||||
m_Pivot: {x: 0, y: 1}
|
m_Pivot: {x: 0, y: 1}
|
||||||
--- !u!114 &8743960904103029316
|
--- !u!114 &8743960904103029316
|
||||||
|
@ -21804,7 +21804,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 432.5, y: 590}
|
m_AnchoredPosition: {x: 441, y: 711}
|
||||||
m_SizeDelta: {x: 154, y: 120}
|
m_SizeDelta: {x: 154, y: 120}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2488584715625453802
|
--- !u!222 &2488584715625453802
|
||||||
|
|
|
@ -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()
|
||||||
|
|
|
@ -730,7 +730,7 @@ function this.GetShiQiValue()
|
||||||
local moraleLv1 = 0
|
local moraleLv1 = 0
|
||||||
local itemCount = BagManager.GetItemCountById(this.shiQiValue)
|
local itemCount = BagManager.GetItemCountById(this.shiQiValue)
|
||||||
for k,v in ConfigPairs(endlessMorale) do
|
for k,v in ConfigPairs(endlessMorale) do
|
||||||
if not v.Exp or #v.Exp < 1 then
|
if not v.Exp or #v.Exp < 2 then
|
||||||
moraleLv1 = v.Level
|
moraleLv1 = v.Level
|
||||||
id = v.Id
|
id = v.Id
|
||||||
break
|
break
|
||||||
|
@ -773,7 +773,7 @@ function this.GetTreasureLevel()
|
||||||
local moraleLv1 = 0
|
local moraleLv1 = 0
|
||||||
local itemCount = BagManager.GetItemCountById(this.scoreValueId)
|
local itemCount = BagManager.GetItemCountById(this.scoreValueId)
|
||||||
for k,v in ConfigPairs(endlessTreasure) do
|
for k,v in ConfigPairs(endlessTreasure) do
|
||||||
if not v.Integral or #v.Integral < 1 then
|
if not v.Integral or #v.Integral < 1 or #v.Integral[1] < 2 then
|
||||||
moraleLv1 = v.Level
|
moraleLv1 = v.Level
|
||||||
id = v.Id
|
id = v.Id
|
||||||
break
|
break
|
||||||
|
@ -781,7 +781,7 @@ function this.GetTreasureLevel()
|
||||||
moraleLv1 = v.Level
|
moraleLv1 = v.Level
|
||||||
id = v.Id
|
id = v.Id
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return id,moraleLv1
|
return id,moraleLv1
|
||||||
end
|
end
|
||||||
|
|
|
@ -126,38 +126,55 @@ function EndLessMapView:BindEvent()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if not this:CanClick() then return end
|
if not this:CanClick() then return end
|
||||||
local u = function(pro)
|
local s = function(pro)
|
||||||
local str = ""
|
local str = ""
|
||||||
for i = 1,#pro do
|
local index = 1
|
||||||
if i ~= 1 then
|
for k,v in pairs(pro) do
|
||||||
str = str .. ","
|
local config = ConfigManager.GetConfigData(ConfigName.PropertyConfig,k)
|
||||||
end
|
|
||||||
local config = ConfigManager.GetConfigData(ConfigName.PropertyConfig,pro[i][1])
|
|
||||||
if not config then
|
if not config then
|
||||||
return ""
|
|
||||||
else
|
else
|
||||||
|
if index ~= 1 then
|
||||||
|
str = str .. ","
|
||||||
|
end
|
||||||
str = str .. config.Info .. "+"
|
str = str .. config.Info .. "+"
|
||||||
str = str .. GetEquipPropertyFormatStr(config.Style,pro[i][2])
|
str = str .. GetEquipPropertyFormatStr(config.Style,v)
|
||||||
|
index = index + 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return str
|
return str
|
||||||
end
|
end
|
||||||
|
local u = function(id,isAppend,pros)
|
||||||
|
for i = (isAppend and id or 1), id do
|
||||||
|
LogGreen("i:"..i)
|
||||||
|
local pro = endlessMorale[i].Props or {}
|
||||||
|
for k,v in ipairs(pro) do
|
||||||
|
if not pros[v[1]] then
|
||||||
|
pros[v[1]] = 0
|
||||||
|
end
|
||||||
|
pros[v[1]] = pros[v[1]] + v[2]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return pros
|
||||||
|
end
|
||||||
local s = function(index)
|
local s = function(index)
|
||||||
local id, lv = EndLessMapManager.GetShiQiValue()
|
local id, lv = EndLessMapManager.GetShiQiValue()
|
||||||
local pro1,nextPro = nil
|
--local pro1,nextPro = nil
|
||||||
local pro = {}
|
local pro = {}
|
||||||
if index == 1 then --属性加成
|
if index == 1 then --属性加成
|
||||||
pro1 = (endlessMorale[id].Props and #endlessMorale[id].Props > 0) and endlessMorale[id].Props or {}
|
local pros = {}
|
||||||
local str = u(pro1)
|
local pros = u(id,false,pros)
|
||||||
|
local str = s(pros)
|
||||||
if str and str ~= "" then
|
if str and str ~= "" then
|
||||||
table.insert(pro,string.format("本级加成:全体神将<color=#55c688>%s</color>",str))
|
table.insert(pro,string.format("本级加成:全体神将<color=#55c688>%s</color>",str))
|
||||||
end
|
end
|
||||||
nextPro = (endlessMorale[id + 1] and endlessMorale[id + 1].Props and #endlessMorale[id + 1].Props > 0) and endlessMorale[id + 1].Props or {}
|
id = id + 1
|
||||||
LogGreen("#nextPro:"..#nextPro)
|
if endlessMorale[id] then
|
||||||
local str = u(nextPro)
|
local pros = u(id,true,pros)
|
||||||
if str and str ~= "" then
|
local str = s(pros)
|
||||||
table.insert(pro,string.format("下级加成:全体神将<color=#55c688>%s</color>",str))
|
if str and str ~= "" then
|
||||||
end
|
table.insert(pro,string.format("下级加成:全体神将<color=#55c688>%s</color>",str))
|
||||||
|
end
|
||||||
|
end
|
||||||
else --特殊加成
|
else --特殊加成
|
||||||
for k,v in ConfigPairs(endlessMorale) do
|
for k,v in ConfigPairs(endlessMorale) do
|
||||||
if v.Skill and v.Skill > 0 then
|
if v.Skill and v.Skill > 0 then
|
||||||
|
|
|
@ -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