【固定活动】调整
parent
a8f666e901
commit
fd97f584cb
Binary file not shown.
After Width: | Height: | Size: 31 KiB |
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 339a7c094c1b087458dcf47c652c0738
|
||||
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: b69690d20f7fe6d4482436eb392a4da8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TagButtonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 30 KiB |
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0665be4553ebf8744a91d2e7f8be8e8a
|
||||
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: 4a359ab8af29e76469e46c4e4060632b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TagButtonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -25143,6 +25143,14 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 149
|
||||
resAbNameIndex: 78
|
||||
- resName: r_tongyong_meiritehui
|
||||
extension: .png
|
||||
resPathIndex: 149
|
||||
resAbNameIndex: 78
|
||||
- resName: r_tongyong_meiritehui_01
|
||||
extension: .png
|
||||
resPathIndex: 149
|
||||
resAbNameIndex: 78
|
||||
- resName: r_wujin_biaojianniu_zh
|
||||
extension: .png
|
||||
resPathIndex: 149
|
||||
|
@ -77268,6 +77276,7 @@ MonoBehaviour:
|
|||
- lz4/dynamicatlas/r_meiriqiandao_xian.unity3d
|
||||
- lz4/dynamicatlas/r_tanchuang_erji_002.unity3d
|
||||
- lz4/dynamicatlas/r_tanchuang_fenge_001.unity3d
|
||||
- lz4/dynamicatlas/r_tanchuang_fenge_002.unity3d
|
||||
- lz4/dynamicatlas/r_tongyong_xiaanniu_di.unity3d
|
||||
- lz4/dynamicatlas/s_slbz_banner.unity3d
|
||||
- lz4/dynamicatlas/s_slbz_kuang1.unity3d
|
||||
|
|
|
@ -83,7 +83,7 @@ function TimeLimitUpHero:BindEvent()
|
|||
JumpManager.GoJump(40014)
|
||||
end)
|
||||
Util.AddClick(self.btn_hero.gameObject, function()
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChooseUpHero,self.actId,curHeroId)
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ChooseUpHero,self.actId,curHeroId)
|
||||
end)
|
||||
Util.AddClick(self.dragView.gameObject, function()
|
||||
local SkeletonGraphic = heroLiveObj:GetComponent("SkeletonGraphic")
|
||||
|
|
|
@ -38,6 +38,8 @@ local contentScripts = {
|
|||
--灵脉秘境纪录
|
||||
[GENERAL_POPUP_TYPE.LingMaiRecord] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_LingMaiRecord"), panelName = "GeneralBigPopup_LingMaiRecord"},
|
||||
[GENERAL_POPUP_TYPE.IncarnationDes] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_IncarnationDes"), panelName = "GeneralBigPopup_IncarnationDes"},
|
||||
--寻仙招募选择up英雄
|
||||
[GENERAL_POPUP_TYPE.ChooseUpHero] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpHero"), panelName = "GeneralBigPopup_ChooseUpHero"},
|
||||
}
|
||||
--子模块预设
|
||||
local contentPrefabs={}
|
||||
|
@ -94,19 +96,21 @@ end
|
|||
function GeneralBigPopup:OnSortingOrderChange()
|
||||
this.sortingOrder = self.sortingOrder
|
||||
end
|
||||
local onOpenArgs--临时接的参数 需要onshow刷新的调用
|
||||
function GeneralBigPopup:OnOpen(popupKey,...)
|
||||
onOpenArgs = {...}
|
||||
for key, value in pairs(contentPrefabs) do
|
||||
value.gameObject:SetActive(false)
|
||||
end
|
||||
this.Mask:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook)
|
||||
this.BG:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook)
|
||||
this.popupKey = popupKey
|
||||
this.args = {...}
|
||||
contentScripts[this.popupKey].view:OnShow(this,onOpenArgs)--1、传入自己 2、传入不定参
|
||||
end
|
||||
|
||||
function GeneralBigPopup:OnShow()
|
||||
contentPrefabs[this.popupKey].gameObject:SetActive(true)
|
||||
contentScripts[this.popupKey].view:OnShow(this,this.args)--1、传入自己 2、传入不定参
|
||||
contentScripts[this.popupKey].view:OnShow(this,onOpenArgs)--1、传入自己 2、传入不定参
|
||||
end
|
||||
|
||||
function GeneralBigPopup:OnClose()
|
||||
|
|
|
@ -69,7 +69,6 @@ local contentScripts = {
|
|||
[GENERAL_POPUP_TYPE.RecrutReward] = {view = require("Modules/Popup/View/GeneralPopup_RecruitReward"), panelName = "GeneralPopup_RecruitReward"},
|
||||
|
||||
--限时抽卡选择up英雄
|
||||
[GENERAL_POPUP_TYPE.ChooseUpHero] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpHero"), panelName = "GeneralPopup_ChooseUpHero"},
|
||||
[GENERAL_POPUP_TYPE.WuJinSetting] = {view = require("Modules/Popup/View/GeneralPopup_EndlessPanel"), panelName = "GeneralPopup_EndlessPanel"},
|
||||
--up魂印
|
||||
[GENERAL_POPUP_TYPE.ChooseUpSoul] = {view = require("Modules/Popup/View/GeneralPopup_ChooseUpSoul"), panelName = "GeneralPopup_ChooseUpSoul"},
|
||||
|
|
|
@ -22,6 +22,14 @@ function this:InitComponent(gameObject)
|
|||
--滚动条根节点
|
||||
this.root = Util.GetGameObject(gameObject, "Root")
|
||||
this.preList={}
|
||||
|
||||
local rootHight = this.root.transform.rect.height
|
||||
local width = this.root.transform.rect.width
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.root.transform,
|
||||
this.prefab,nil, Vector2.New(width, rootHight), 1, 5,Vector2.New(20,40))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 2
|
||||
this.ScrollView.elastic = false
|
||||
end
|
||||
|
||||
function this:BindEvent()
|
||||
|
@ -29,12 +37,11 @@ function this:BindEvent()
|
|||
parent:ClosePanel()
|
||||
end)
|
||||
Util.AddClick(this.confirmBtn,function()
|
||||
NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function()
|
||||
ActivityGiftManager.SetActivityInfoRewardId(args[1],currHeroId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,currHeroId)
|
||||
parent:ClosePanel()
|
||||
end)
|
||||
|
||||
NetManager.ChoiceHeroRewardRequest(args[1],currHeroId,function()
|
||||
ActivityGiftManager.SetActivityInfoRewardId(args[1],currHeroId)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,currHeroId)
|
||||
parent:ClosePanel()
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
|
@ -44,10 +51,10 @@ end
|
|||
function this:RemoveListener()
|
||||
end
|
||||
|
||||
function this:OnShow(_parent,...)
|
||||
function this:OnShow(_parent,_args)
|
||||
args = _args
|
||||
parent=_parent
|
||||
sortingOrder =_parent.sortingOrder
|
||||
args = {...}
|
||||
local upConfig=ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",args[1])
|
||||
if not upConfig then
|
||||
return
|
||||
|
@ -62,24 +69,13 @@ function this:OnShow(_parent,...)
|
|||
for i = 1, #heros do
|
||||
table.insert(heroDatas,heroConfig[heros[i]])
|
||||
end
|
||||
for i = 1, math.max(#this.preList,#heroDatas) do
|
||||
local item=this.preList[i]
|
||||
if not item then
|
||||
item=newObject(this.prefab)
|
||||
item.transform:SetParent(this.root.transform)
|
||||
item.transform.localScale=Vector3.one
|
||||
item.transform.localPosition=Vector3.zero
|
||||
this.preList[i]=item
|
||||
end
|
||||
item.gameObject:SetActive(false)
|
||||
end
|
||||
for key, value in pairs(heroDatas) do
|
||||
this.SingleHeroDataShow(this.preList[key],heroDatas[key])
|
||||
end
|
||||
this.ScrollView:SetData(heroDatas, function(index, go)
|
||||
this.SingleHeroDataShow(go,heroDatas[index],index)
|
||||
end)
|
||||
end
|
||||
|
||||
--英雄单个数据展示
|
||||
function this.SingleHeroDataShow(go,_heroData)
|
||||
function this.SingleHeroDataShow(go,_heroData,_index)
|
||||
local heroData = _heroData
|
||||
local _go = go
|
||||
_go.gameObject:SetActive(true)
|
||||
|
@ -92,14 +88,14 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
if _heroData.Id==currHeroId then
|
||||
this.selectObj.transform:SetParent(_go.transform)
|
||||
this.selectObj.transform.localScale=Vector3.one
|
||||
this.selectObj.transform.localPosition=Vector3.New(0,30,0)
|
||||
this.selectObj.transform.localPosition=Vector3.New(0,0,0)
|
||||
end
|
||||
SetHeroStars(this.spLoader, starGrid, heroData.Star,1,nil,-15)
|
||||
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
|
||||
Util.AddOnceClick(cardclickBtn, function()
|
||||
this.selectObj.transform:SetParent(_go.transform)
|
||||
this.selectObj.transform.localScale=Vector3.one
|
||||
this.selectObj.transform.localPosition=Vector3.New(0,30,0)
|
||||
this.selectObj.transform.localPosition=Vector3.New(0,0,0)
|
||||
currHeroId=_heroData.Id
|
||||
end)
|
||||
Util.AddLongPressClick(cardclickBtn, function()
|
||||
|
|
Loading…
Reference in New Issue