【跨服天梯】国内提交+1

dev_chengFeng
zhangqiang 2021-07-13 11:28:36 +08:00
parent 7c7e0970a2
commit 5162b3247c
14 changed files with 6844 additions and 6591 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: 4abb9366bb4707c45a51db9f261b25f4
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 82a9db1446e223d429ed045bef3e0ded
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -0,0 +1,99 @@
fileFormatVersion: 2
guid: c56783658ff4bfd42940719bc5875c13
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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 1db157bcea17d2542881e062e79df8e1
vertices: []
indices:
edges: []
weights: []
spritePackingTag: TagAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1753,7 +1753,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 231, y: 1.9}
m_AnchoredPosition: {x: 170, y: 1.9}
m_SizeDelta: {x: 602.86, y: 201.33}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &481393429516975087

View File

@ -2360,7 +2360,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag
[15] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_PROGRESS,activiteId = 0,isRankingMainPanelShow = false},
[16] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = false},
[17] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = false},
[18] = { bgImage = "r_zjm_paihangbang_banner01", name = "天梯排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = false},
[18] = { bgImage = "r_zjm_paihangbang_banner01", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = false},
}
SoulPrintSpriteByQuantity={

View File

@ -12,6 +12,7 @@ GETWORLDARENAINFORESPONSE_STAGE_FIELD = protobuf.FieldDescriptor();
GETWORLDARENAINFORESPONSE_ENDTIME_FIELD = protobuf.FieldDescriptor();
GETWORLDARENAINFORESPONSE_ENTERABLE_FIELD = protobuf.FieldDescriptor();
GETWORLDARENAINFORESPONSE_ISGROUP_FIELD = protobuf.FieldDescriptor();
GETWORLDARENAINFORESPONSE_ISSTART_FIELD = protobuf.FieldDescriptor();
GETWORLDARENAINFOINDICATION = protobuf.Descriptor();
GETWORLDARENAINFOINDICATION_ARENAINFO_FIELD = protobuf.FieldDescriptor();
GETWORLDARENAINFOINDICATION_STAGE_FIELD = protobuf.FieldDescriptor();
@ -195,11 +196,21 @@ GETWORLDARENAINFORESPONSE_ISGROUP_FIELD.default_value = 0
GETWORLDARENAINFORESPONSE_ISGROUP_FIELD.type = 5
GETWORLDARENAINFORESPONSE_ISGROUP_FIELD.cpp_type = 1
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.name = "isStart"
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.full_name = ".rpc.world.GetWorldArenaInfoResponse.isStart"
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.number = 6
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.index = 5
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.label = 1
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.has_default_value = false
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.default_value = 0
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.type = 5
GETWORLDARENAINFORESPONSE_ISSTART_FIELD.cpp_type = 1
GETWORLDARENAINFORESPONSE.name = "GetWorldArenaInfoResponse"
GETWORLDARENAINFORESPONSE.full_name = ".rpc.world.GetWorldArenaInfoResponse"
GETWORLDARENAINFORESPONSE.nested_types = {}
GETWORLDARENAINFORESPONSE.enum_types = {}
GETWORLDARENAINFORESPONSE.fields = {GETWORLDARENAINFORESPONSE_ARENAINFO_FIELD, GETWORLDARENAINFORESPONSE_STAGE_FIELD, GETWORLDARENAINFORESPONSE_ENDTIME_FIELD, GETWORLDARENAINFORESPONSE_ENTERABLE_FIELD, GETWORLDARENAINFORESPONSE_ISGROUP_FIELD}
GETWORLDARENAINFORESPONSE.fields = {GETWORLDARENAINFORESPONSE_ARENAINFO_FIELD, GETWORLDARENAINFORESPONSE_STAGE_FIELD, GETWORLDARENAINFORESPONSE_ENDTIME_FIELD, GETWORLDARENAINFORESPONSE_ENTERABLE_FIELD, GETWORLDARENAINFORESPONSE_ISGROUP_FIELD, GETWORLDARENAINFORESPONSE_ISSTART_FIELD}
GETWORLDARENAINFORESPONSE.is_extendable = false
GETWORLDARENAINFORESPONSE.extensions = {}
GETWORLDARENAINFOINDICATION_ARENAINFO_FIELD.name = "arenaInfo"

View File

@ -36,7 +36,7 @@ end
function this.InitView()
this.root.bg:SetActive(true)
this.root.btn_2:SetActive(true)
this.root.btn_2_lab.text = Language[10559]
this.root.btn_2_lab.text = Language[10715]
this.root.btn_1:SetActive(true)
this.root.btn_1_lab.text = Language[10710]

View File

@ -205,7 +205,7 @@ function this.ShowSingleData(go,data,i)
liveDef:SetActive(true)
Util.GetGameObject(go, "sdBtn/Text"):SetActive(true)
Util.GetGameObject(go, "sdBtn/Text"):GetComponent("Text").text = "虚以待位"
local str = i % 2 > 0 and "s_sanjiechumo_ren_1" or "s_sanjiechumo_ren_2"
local str = "s_sanjiechumo_ren_1"--i % 2 > 0 and "s_sanjiechumo_ren_1" or "s_sanjiechumo_ren_2"
Util.GetGameObject(go, "liveDef"):GetComponent("Image").sprite = this.spLoader:LoadSprite(str)
Util.AddOnceClick(sdBtn,function()
@ -222,7 +222,7 @@ function this.ShowSingleData(go,data,i)
Util.GetGameObject(go, "playerInfo/warPower/powerBtn/value"):GetComponent("Text").text = data.personInfo.totalForce
Util.GetGameObject(go, "playerInfo/warPower/Text"):GetComponent("Text").text = "".. data.personInfo.rank ..""
local live = Util.GetGameObject(go, "playerInfo/live")
this.LocadPersonInfoLive(go,0,live.transform)--NameManager.roleSex
this.LocadPersonInfoLive(go,data.personInfo,live.transform)--NameManager.roleSex
sdBtnRedPoint:SetActive(JumpServerManager.GetCanBattleCount() > 0 and enterable)
Util.AddOnceClick(sdBtn,function()
if not enterable then
@ -250,7 +250,7 @@ function this.ShowSingleData(go,data,i)
Util.GetGameObject(go, "playerInfo/warPower/powerBtn/value"):GetComponent("Text").text = data.personInfo.totalForce
Util.GetGameObject(go, "playerInfo/warPower/Text"):GetComponent("Text").text = "".. data.personInfo.rank ..""
local live = Util.GetGameObject(go, "playerInfo/live")
this.LocadPersonInfoLive(go,data.personInfo.gender,live.transform)
this.LocadPersonInfoLive(go,data.personInfo,live.transform)
sdBtnRedPoint:SetActive(not data.hadProud)
Util.GetGameObject(go, "sdBtn/Text"):GetComponent("Text").text = "膜 拜"
Util.GetGameObject(go, "sdBtn/Text"):SetActive(not data.hadProud)
@ -270,19 +270,38 @@ function this.ShowSingleData(go,data,i)
end)
end
end
function this.LocadPersonInfoLive(go,roleSex,live)
function this.LocadPersonInfoLive(go,data,live)
-- if liveNodeList[go] then
-- poolManager:UnLoadLive(liveNodeList[go].name, liveNodeList[go].go, PoolManager.AssetType.GameObject)
-- end
-- local npc = roleSex == ROLE_SEX.BOY and "live2d_npc_map_boy" or "live2d_npc_map_nv"
-- local scale = roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.16
-- local live2d = poolManager:LoadLive(npc, live,scale, Vector3.zero)
-- local SkeletonGraphic = live2d:GetComponent("SkeletonGraphic")
-- if SkeletonGraphic then
-- SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
-- SkeletonGraphic.transform.localEulerAngles = Vector3.New(0, 0, 0)
-- end
-- liveNodeList[go] = {name=npc, go=live2d}
if liveNodeList[go] then
poolManager:UnLoadLive(liveNodeList[go].name, liveNodeList[go].go, PoolManager.AssetType.GameObject)
liveNodeList[go]:OnClose()
liveNodeList[go] = nil
end
local npc = roleSex == ROLE_SEX.BOY and "live2d_npc_map_boy" or "live2d_npc_map_nv"
local scale = roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.16
local live2d = poolManager:LoadLive(npc, live,scale, Vector3.zero)
local SkeletonGraphic = live2d:GetComponent("SkeletonGraphic")
if SkeletonGraphic then
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
SkeletonGraphic.transform.localEulerAngles = Vector3.New(0, 0, 0)
end
liveNodeList[go] = {name=npc, go=live2d}
local curPlayerLiveViewData = {
skin = data.userSkin,
sex = data.gender,
ride = data.userMount,
designation = 0--data.userTitle,
}
LogYellow("data.userSkin "..data.userSkin)
LogYellow("data.gender "..data.gender)
LogYellow("data.userMount "..data.userMount)
LogYellow("data.userTitle "..data.userTitle)
liveNodeList[go] = PlayerLiveView:New(live.transform,2, curPlayerLiveViewData,this.sortingOrder)
liveNodeList[go]:SetNameHeight(-2.5)
liveNodeList[go]:OnOpen(GetPlayerRoleSingleConFig().Scale6,Vector3.New(0,-118.65,0),WALK_DIR.IDLE_LEFT)
-- liveNodeList[go] = {name=npc, go=live2d}
end
--刷新倒计时显示
function this.RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown,str)
@ -365,7 +384,9 @@ function this.BuyVipFun(type,warOrSd,fun)
ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,JumpServerManager.shopGoodId,1,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_BUYNUM, 1)--更新特权
local tipStr2 = warOrSd == 1 and "挑战成功!" or "扫荡成功!"
PopupTipPanel.ShowTip(tipStr2)
if warOrSd == 2 then
PopupTipPanel.ShowTip(tipStr2)
end
if fun then
fun ()
end
@ -420,8 +441,9 @@ end
--界面销毁时调用(用于子类重写)
function JumpServerHightLadderPanel:OnDestroy()
for key, value in pairs(liveNodeList) do
poolManager:UnLoadLive(value.name, value.go, PoolManager.AssetType.GameObject)
liveNodeList = {}
-- poolManager:UnLoadLive(value.name, value.go, PoolManager.AssetType.GameObject)
-- liveNodeList = {}
value:OnClose()
end
this.spLoader:Destroy()
end

View File

@ -63,7 +63,7 @@ function JumpServerHightLadderRewardSortPanel:OnShow()
self.content2:SetActive(false)
self.content3:SetActive(true)
self:ActivitySortRewardShow()
self.titleTextExpert.text = Language[10531]
self.titleTextExpert.text = Language[10576]
end
--排名奖励1

View File

@ -10,6 +10,7 @@ local myRank = -1
local oldMyRank = -1
local enterable = -1-- -1不可参加 是否可以参加 竞技场100名以内参加
local isGroup = 0--是否被分组 是1 否0
local isStart = 0
this.shopGoodId = 10035--挑战价格
function this.Initialize()
@ -54,12 +55,14 @@ function this.InithightLadderData(_msg)
LogPink("_msg.arenaInfo.score ".._msg.arenaInfo.score)
LogPink("_msg.enterable ".._msg.enterable)
LogPink("_msg.isGroup ".._msg.isGroup)
LogPink("_msg.isStart ".._msg.isStart)
arenaInfo = _msg.arenaInfo
stage = _msg.stage
endTime = _msg.endTime
myRank = _msg.arenaInfo.score
enterable = _msg.enterable--是否可以参加 竞技场100名以内参加
isGroup = _msg.isGroup--是否被分组 是1 否0
isStart = _msg.isStart--是否在3周内在为0 不在为1
end
--推送更新
function this.IndicationHightLadderData(_msg)
@ -103,6 +106,9 @@ end
function this.GetHightLadderDataIsGroup()
return isGroup ~= 0
end
function this.GetHightLadderDataIsStart()
return isStart == 1
end
-- 获取剩余挑战次数 特权
function this.GetCanBattleCount()
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.JUMPSERVER_GIGHTLADDER_MIANFEINUM)
@ -230,6 +236,10 @@ function this.JumpServerHightLadderMianFeiNumRedPoint()
-- LogPink("跨服天梯剩余免费挑战次数红点false")
return false
end
if not this.GetHightLadderDataIsStart() then
-- LogPink("跨服天梯剩余免费挑战次数红点false")
return false
end
if stage == 2 then
if this.GetCanBattleCount() > 0 then
-- LogPink("跨服天梯剩余免费挑战次数红点true")
@ -253,6 +263,10 @@ function this.JumpServerHightLadderWorshipRedPoint()
-- LogPink("跨服天梯剩余免费挑战次数红点false")
return false
end
if not this.GetHightLadderDataIsStart() then
-- LogPink("跨服天梯剩余免费挑战次数红点false")
return false
end
if stage == 3 then
local datas = this.GetHightLadderDataArenaInfo()

View File

@ -87,7 +87,7 @@ end
--跨服
function JumpServerPanel:OnOpen()
this.UpView:OnOpen({showType = UpViewOpenType.ShowRight, panelType = PanelType.Main})
this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main})
JumpServerManager.CheckJumpServerhightLadderMainCityRedPoint()
end
@ -164,11 +164,14 @@ function this.BtnClick(id)
end
JumpServerManager.GetWorldArenaInfoRequest(function()
if JumpServerManager.GetHightLadderDataIsGroup() then
UIManager.OpenPanel(UIName.JumpServerHightLadderPanel)
else
if not JumpServerManager.GetHightLadderDataIsGroup() then
PopupTipPanel.ShowTip("未划分跨服分组,无法参与!")
return
elseif not JumpServerManager.GetHightLadderDataIsStart() then
PopupTipPanel.ShowTip(string.format("开服第%s周开放",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).OpenWeek))--)--MServerArenaSetting
return
else
UIManager.OpenPanel(UIName.JumpServerHightLadderPanel)
end
end)
else

View File

@ -410,15 +410,20 @@ function this.RefreshBtnShow()
return
end
-- 判断该界面类型是否有按钮显示
LogYellow("this._ViewType "..this._ViewType.." "..tostring(not JumpServerManager.GetCurPersonInfo()))
if not this._Config or not this._Config.btnType or (this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER and not JumpServerManager.GetCurPersonInfo()) then
this.boxLine:SetActive(false)
this.btnBox:SetActive(false)
this.addFriendBtn:SetActive(false)
return
end
if this._ViewType == PLAYER_INFO_VIEW_TYPE.JUPMSERVER then
this.addFriendBtn:SetActive(false)
else
this.addFriendBtn:SetActive(true)
end
-- 有按钮显示
local btnType = this._Config.btnType
this.addFriendBtn:SetActive(true)
this.btnBox:SetActive(true)
for index, btn in ipairs(this.btnList) do
btn:SetActive(btnType[index] ~= nil)