Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
4447f37b62
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
|
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f2393ce2d23f490409ca62cfa0b8f917
|
||||
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: 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: 0905c9e28a8dc144283adcc6abf994f3
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TagButtonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
|
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6654779a34606bb41ae773ee30552560
|
||||
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: 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: bd1d00c98ad1620479ff7f8d6af0cf92
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: TagButtonAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -111233,6 +111233,7 @@ RectTransform:
|
|||
- {fileID: 2866440957157781469}
|
||||
- {fileID: 1694038629151059246}
|
||||
- {fileID: 6967453100348782406}
|
||||
- {fileID: 2123381437356778877}
|
||||
m_Father: {fileID: 6882643634657733322}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -112783,6 +112784,80 @@ MonoBehaviour:
|
|||
m_LineSpacing: 0.94
|
||||
m_Text: "\u7389\u7687\u5927\u5E1D"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &4390960374646630457
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2123381437356778877}
|
||||
- component: {fileID: 791236077759547715}
|
||||
- component: {fileID: 7431224673380378147}
|
||||
m_Layer: 5
|
||||
m_Name: redPot
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2123381437356778877
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4390960374646630457}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7587722306364218479}
|
||||
m_RootOrder: 5
|
||||
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: 60, y: -120}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &791236077759547715
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4390960374646630457}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7431224673380378147
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4390960374646630457}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &4537415796437960469
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -114614,7 +114689,7 @@ MonoBehaviour:
|
|||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u524D\u5F80\u5B8C\u6210"
|
||||
m_Text: "\u9886 \u53D6"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &6930476946847958737
|
||||
GameObject:
|
||||
|
|
|
|||
|
|
@ -694,6 +694,7 @@ RedPointType = {
|
|||
|
||||
FirstRecharge = 233,--首充
|
||||
SupremeHero=234,--剑影仙踪
|
||||
SupremeHero_mission3=2341,--剑影仙踪第三个奖励
|
||||
LuckyTurn= 235,--幸运探宝
|
||||
FindFairy=236,--东海寻仙
|
||||
---主界面按钮
|
||||
|
|
|
|||
|
|
@ -976,7 +976,13 @@ function this.CheckSupremeHeroRedPoint()
|
|||
isOpen=receive<3
|
||||
end
|
||||
|
||||
return isOpen
|
||||
--第三个任务红点检测
|
||||
local state = false
|
||||
local finishedNum, missionData = this.GetTaskData()
|
||||
if missionData[3] == 3 then
|
||||
state = true
|
||||
end
|
||||
return (isOpen or state)
|
||||
end
|
||||
|
||||
--获取活动结束时间
|
||||
|
|
|
|||
|
|
@ -109,9 +109,13 @@ function BagResolveAnCompoundPanel:BindEvent()
|
|||
this.ShowCompoundNumData(value)
|
||||
end)
|
||||
Util.AddClick(this.addBtn, function()
|
||||
if compoundNum<compoundMaxNum then
|
||||
compoundNum=compoundNum+1
|
||||
this.ShowCompoundNumData(compoundNum)
|
||||
if endHeroNum > 0 then
|
||||
if compoundNum<compoundMaxNum then
|
||||
compoundNum=compoundNum+1
|
||||
this.ShowCompoundNumData(compoundNum)
|
||||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[12157])
|
||||
end
|
||||
end)
|
||||
Util.AddClick(this.jianBtn, function()
|
||||
|
|
@ -126,16 +130,12 @@ function BagResolveAnCompoundPanel:BindEvent()
|
|||
local item={}
|
||||
item.itemId=itemData.id
|
||||
item.itemNum=compoundNum*itemData.itemConfig.UsePerCount
|
||||
Log("sssssssssssssss "..item.itemId.." "..item.itemNum)
|
||||
-- Log("sssssssssssssss "..item.itemId.." "..item.itemNum)
|
||||
NetManager.HeroComposeRequest(item,function (drop)
|
||||
this.SendBackCompoundReCallBack(drop)
|
||||
end)
|
||||
else
|
||||
if endHeroNum > 0 then
|
||||
PopupTipPanel.ShowTip(Language[10183])
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[12157])
|
||||
end
|
||||
end
|
||||
elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱
|
||||
if compoundNum>0 then
|
||||
|
|
@ -144,7 +144,7 @@ function BagResolveAnCompoundPanel:BindEvent()
|
|||
item.itemId=itemData.id
|
||||
item.itemNum=compoundNum--*itemData.itemConfig.UsePerCount
|
||||
table.insert(itemList,item)
|
||||
Log("sssssssssssssss "..item.itemId.." "..item.itemNum)
|
||||
-- Log("sssssssssssssss "..item.itemId.." "..item.itemNum)
|
||||
NetManager.UseAndPriceItemRequest(0,itemList,function (drop)
|
||||
this.SendBackCompoundReCallBack(drop)
|
||||
end)
|
||||
|
|
@ -173,7 +173,7 @@ function BagResolveAnCompoundPanel:BindEvent()
|
|||
end
|
||||
end
|
||||
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
@ -234,7 +234,7 @@ function this.OnShowLayout1Data()
|
|||
end
|
||||
--设置单个
|
||||
function this.OnShowLayout1Single(_btnGo,_index)--_index 0-7
|
||||
Log("_index ".._index)
|
||||
-- Log("_index ".._index)
|
||||
if _index==0 then--选择全部
|
||||
resolveBooleList[1] = not resolveBooleList[1]
|
||||
resolveBooleList={resolveBooleList[1],false,false,false,false,false,false,false}
|
||||
|
|
@ -255,7 +255,7 @@ function this.OnShowLayout1Single(_btnGo,_index)--_index 0-7
|
|||
Util.GetGameObject(_btnGo, "Image"):SetActive(resolveBooleList[_index+1])
|
||||
end
|
||||
for k,v in pairs(curSelectQuantityList) do
|
||||
Log("curSelectQuantityList k v "..k..tostring(v))
|
||||
-- Log("curSelectQuantityList k v "..k..tostring(v))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -314,24 +314,24 @@ function this.OnShowLayout3Data()
|
|||
this.btnCompoundText.text=Language[10197]
|
||||
compoundMaxNum=itemData.num
|
||||
end
|
||||
compoundNum=1
|
||||
compoundNum= compoundNum>=compoundMaxNum and compoundMaxNum or compoundNum
|
||||
if compoundMaxNum > 0 then
|
||||
this.Slider:GetComponent("Slider").value=1
|
||||
this.Slider:GetComponent("Slider").minValue=0
|
||||
else
|
||||
this.Slider:GetComponent("Slider").value=0
|
||||
this.Slider:GetComponent("Slider").minValue=0
|
||||
end
|
||||
this.Slider:GetComponent("Slider").maxValue=compoundMaxNum
|
||||
--this.ShowCompoundNumData(compoundNum)
|
||||
this.ShowCompoundNumData(compoundMaxNum)
|
||||
compoundNum=1
|
||||
compoundNum= compoundNum>=compoundMaxNum and compoundMaxNum or compoundNum
|
||||
if compoundMaxNum > 0 then
|
||||
this.Slider:GetComponent("Slider").value=1
|
||||
this.Slider:GetComponent("Slider").minValue=0
|
||||
else
|
||||
this.Slider:GetComponent("Slider").value=0
|
||||
this.Slider:GetComponent("Slider").minValue=0
|
||||
end
|
||||
this.Slider:GetComponent("Slider").maxValue=compoundMaxNum
|
||||
--this.ShowCompoundNumData(compoundNum)
|
||||
this.ShowCompoundNumData(compoundMaxNum)
|
||||
end
|
||||
--道具 和 装备分解 发送请求
|
||||
function this.SendBackResolveRe()
|
||||
isShowTishi=false
|
||||
curResolveAllItemList={}
|
||||
Log("itemResolveType "..itemResolveType)
|
||||
-- Log("itemResolveType "..itemResolveType)
|
||||
if itemResolveType==ItemBaseType.Equip then--装备
|
||||
for i = 1, #itemList do
|
||||
if resolveBooleList[1]==true and itemList[i].itemConfig.IfResolve==1 then
|
||||
|
|
@ -340,9 +340,9 @@ function this.SendBackResolveRe()
|
|||
end
|
||||
table.insert(curResolveAllItemList,itemList[i].did)
|
||||
else
|
||||
Log("itemList[i].equipConfig.Quality "..itemList[i].equipConfig.Quality)
|
||||
-- Log("itemList[i].equipConfig.Quality "..itemList[i].equipConfig.Quality)
|
||||
if curSelectQuantityList[itemList[i].equipConfig.Quality]==true and itemList[i].itemConfig.IfResolve==1 then
|
||||
Log("itemList[i].did "..itemList[i].did)
|
||||
-- Log("itemList[i].did "..itemList[i].did)
|
||||
if itemList[i].equipConfig.Quality>=4 then
|
||||
isShowTishi=true
|
||||
end
|
||||
|
|
@ -436,7 +436,7 @@ function this.SendBackCompoundReCallBack(drop)
|
|||
end
|
||||
|
||||
function this.ShowCompoundNumData(value)
|
||||
Log("当前slider值 "..value)
|
||||
-- Log("当前slider值 "..value)
|
||||
compoundNum=value
|
||||
this.Slider:GetComponent("Slider").value=value
|
||||
this.numText1.text = value
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ function this:BindEvent()
|
|||
else
|
||||
NetManager.SaveHeroChangeRequest(curSelectHero.dynamicId,function (msg)
|
||||
HeroManager.ResetHeroChangeId(curSelectHero.dynamicId,msg.heroTempId)--改变英雄changeId
|
||||
|
||||
this.replaceHero:SetActive(true)
|
||||
this.cancelBtn:SetActive(true)
|
||||
this.replaceBtn:SetActive(false)
|
||||
|
|
@ -65,9 +64,7 @@ function this:BindEvent()
|
|||
this.replaceBg:SetActive(false)
|
||||
this.text:SetActive(false)
|
||||
this.cost:SetActive(false)
|
||||
|
||||
this.ShowCostInfo()
|
||||
|
||||
local value = this.RebuildData(msg.heroTempId,curSelectHero)
|
||||
this.SetHero(this.replaceHero,value)
|
||||
end)
|
||||
|
|
@ -77,7 +74,6 @@ function this:BindEvent()
|
|||
Util.AddClick(this.cancelBtn,function()
|
||||
NetManager.CancelHeroChangeRequest(curSelectHero.dynamicId,function (msg)
|
||||
HeroManager.ResetHeroChangeId(curSelectHero.dynamicId)--改变英雄changeId
|
||||
|
||||
this.replaceHero:SetActive(false)
|
||||
this.needHero:SetActive(true)
|
||||
this.cancelBtn:SetActive(false)
|
||||
|
|
@ -87,39 +83,26 @@ function this:BindEvent()
|
|||
this.replaceBg:SetActive(true)
|
||||
this.text:SetActive(false)
|
||||
this.cost:SetActive(true)
|
||||
|
||||
this.ShowCostInfo()
|
||||
|
||||
end)
|
||||
end)
|
||||
--保存置换
|
||||
Util.AddClick(this.saveBtn,function()
|
||||
NetManager.DoHeroChangeRequest(curSelectHero.dynamicId,function (msg)
|
||||
|
||||
this.replaceHero:SetActive(false)
|
||||
this.needHero:SetActive(false)
|
||||
this.needBg:SetActive(true)
|
||||
this.replaceBg:SetActive(true)
|
||||
this.text:SetActive(true)
|
||||
this.cost:SetActive(false)
|
||||
|
||||
this.ShowCostInfo()
|
||||
|
||||
HeroManager.DeleteHeroDatas({curSelectHero.dynamicId})
|
||||
|
||||
for i = 1, #msg.drop.Hero do
|
||||
HeroManager.UpdateHeroDatas(msg.drop.Hero[i])
|
||||
ExpeditionManager.InitHeroHpValue(msg.drop.Hero[i].id)
|
||||
end
|
||||
curSelectHero = HeroManager.GetSingleHeroData(msg.drop.Hero[1].id)
|
||||
this.ShowCurrPosHeroReplace(curIndex)
|
||||
|
||||
-- for i = 1, #heroDatas do
|
||||
-- if heroSelectBtn[i] and heroDatas[i] then
|
||||
-- heroSelectBtn[i]:SetActive(heroDatas[i].dynamicId == curSelectHero.dynamicId)
|
||||
-- end
|
||||
-- end
|
||||
|
||||
end)
|
||||
end)
|
||||
|
||||
|
|
@ -173,6 +156,8 @@ end
|
|||
--英雄类型按钮点击事件
|
||||
function this.HeroReplaceBtnClick(_btn,_curIndex)
|
||||
curIndex = _curIndex
|
||||
this.needBg:SetActive(true)
|
||||
this.replaceBg:SetActive(true)
|
||||
this.SetBtnSelect(_btn)
|
||||
this.ShowCurrPosHeroReplace(_curIndex)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@ local tabs = {
|
|||
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.AccumulativeRechargeExper
|
||||
},
|
||||
[51] = { --累计充值 一周一刷
|
||||
default = "r_huodong_leijichengzhianniu_01_zh", lock = "r_huodong_leijichengzhianniu_01_zh", select = "r_huodong_leijichengzhianniu_zh",
|
||||
default = "r_huodong_leijichengzhianniu_04_zh", lock = "r_huodong_leijichengzhianniu_04_zh", select = "r_huodong_leijichengzhianniu_03_zh",
|
||||
rpType = RedPointType.DynamicActRecharge,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct_recharge
|
||||
},
|
||||
[52] = { --限时商市
|
||||
|
|
|
|||
|
|
@ -517,7 +517,7 @@ end
|
|||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function FindTreasureMainPanel:OnClose()
|
||||
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
|
||||
if timer then
|
||||
timer:Stop()
|
||||
timer = nil
|
||||
|
|
|
|||
|
|
@ -227,6 +227,10 @@ function this:UpdateHeroInfoData()
|
|||
self:UpdateBtnList()
|
||||
self:SetSelectBtn(_CurPageIndex)
|
||||
self:OnPageTabChange(_CurPageIndex)
|
||||
|
||||
|
||||
--角色定位按钮
|
||||
this.posBtn.gameObject:SetActive(heroConFigData.ShowHeroLocation==1)
|
||||
end
|
||||
|
||||
--加载页签内容
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@ end
|
|||
|
||||
--添加事件监听(用于子类重写)
|
||||
function ExpertPage:AddListener()
|
||||
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, self.RefreshData,self)
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function ExpertPage:RemoveListener()
|
||||
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, self.RefreshData,self)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -134,6 +134,7 @@ end
|
|||
|
||||
--刷新数据
|
||||
function ExpertPage:RefreshData(isTop,isAni)
|
||||
LogYellow("刷新了么")
|
||||
self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType)
|
||||
if self.actConfig.RpType > 0 then
|
||||
CheckRedPointStatus(self.actConfig.RpType)
|
||||
|
|
|
|||
|
|
@ -46,12 +46,18 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
end)
|
||||
Util.AddClick(this.btnSure, function()
|
||||
if itemConfigData.ItemType == ItemType.HeroDebris then
|
||||
local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
|
||||
local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
|
||||
local sum = BagManager.GetItemCountById(itemSid) / BagManager.bagDatas[itemSid].itemConfig.UsePerCount
|
||||
if sum >= 2 then
|
||||
local _itemData = BagManager.bagDatas[itemSid]
|
||||
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function()
|
||||
func()
|
||||
end)
|
||||
if endHeroNum > 0 then
|
||||
UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function()
|
||||
func()
|
||||
end)
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[12157])
|
||||
end
|
||||
elseif sum >= 1 and sum < 2 then
|
||||
-- body
|
||||
local compoundNum = 1
|
||||
|
|
@ -59,8 +65,6 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
local item={}
|
||||
item.itemId= _itemData.id
|
||||
item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount
|
||||
local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
|
||||
local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
|
||||
if endHeroNum > 0 then
|
||||
NetManager.HeroComposeRequest(item,function (drop)
|
||||
this.SendBackCompoundReCallBack(drop)
|
||||
|
|
@ -136,7 +140,7 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
end,Language[10731],Language[10732],"",false,"")
|
||||
else
|
||||
PopupTipPanel.ShowTip(string.format(Language[11514],GetLanguageStrById(skinConfig.ReadingName)))
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
elseif itemConfigData.ItemType == ItemType.HeadFrame then
|
||||
|
|
|
|||
|
|
@ -49,14 +49,16 @@ function SupremeHeroPopup:InitComponent()
|
|||
this.itemTitle = {}
|
||||
this.itemList = {}
|
||||
this.btnGet={}
|
||||
for i = 1, 3 do
|
||||
for i = 1, 3 do
|
||||
this.rewardTitle[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/Button/Text"):GetComponent("Text")
|
||||
this.rewardBtn[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/Button")
|
||||
this.iconGrid[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/frame")
|
||||
this.doneImg[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .. "/doneImg")
|
||||
this.btnGet[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .. "/BtnGet")
|
||||
this.itemTitle[i] = Util.GetGameObject(this.middle, "Reward/Panel".. i .."/Image/Title"):GetComponent("Text")
|
||||
|
||||
if i == 3 then
|
||||
this.redPot3 = Util.GetGameObject(this.middle, "Reward/Panel".. i .. "/redPot")
|
||||
end
|
||||
end
|
||||
|
||||
this.activityTime = Util.GetGameObject(self.gameObject, "Panel/Middle/freshTime"):GetComponent("Text")--活动时间
|
||||
|
|
@ -168,6 +170,7 @@ function SupremeHeroPopup:BindEvent()
|
|||
Util.AddClick(this.click, function()
|
||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroId, heroData.Star)
|
||||
end)
|
||||
RedpotManager.BindObject(RedPointType.SupremeHero_mission3,this.redPot3)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
|
@ -287,8 +290,10 @@ function this.SetMissionData()
|
|||
this.rewardBtn[i]:SetActive(this.GetMissionState(i) == 0)
|
||||
this.doneImg[i]:SetActive(this.GetMissionState(i) == 1)
|
||||
this.btnGet[i]:SetActive(false)
|
||||
this.redPot3:SetActive(false)
|
||||
if i == 3 then
|
||||
this.btnGet[i]:SetActive(this.GetMissionState(i) == 3)
|
||||
this.redPot3:SetActive(this.GetMissionState(i) == 3)
|
||||
Util.AddOnceClick(this.btnGet[i],function()
|
||||
NetManager.GetActivityRewardRequest(data.mission[i].missionId, data.activityId,function(drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||
|
|
|
|||
Loading…
Reference in New Issue