四灵提交
parent
c8a2308b00
commit
8eb3babc04
Binary file not shown.
|
After Width: | Height: | Size: 159 KiB |
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e5a4fb016d7d46645a8fc07bf703d726
|
||||
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: 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: e15b0effc65274f42b8e7c6ad3f5601e
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: FourElement
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -2030,7 +2030,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: b32b6d2e6d46e7048bbf3fc8f9372a69, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e5a4fb016d7d46645a8fc07bf703d726, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -2562,13 +2562,14 @@ RectTransform:
|
|||
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_Children:
|
||||
- {fileID: 8165168719503359051}
|
||||
m_Father: {fileID: 3961690423647271749}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -76.5, y: 89.099976}
|
||||
m_AnchoredPosition: {x: -76.5, y: 118.9}
|
||||
m_SizeDelta: {x: 153, y: 153}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6574980211158226527
|
||||
|
|
@ -2958,3 +2959,82 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &9219898995569981882
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8165168719503359051}
|
||||
- component: {fileID: 7204550795754971435}
|
||||
- component: {fileID: 8508423388133823952}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &8165168719503359051
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9219898995569981882}
|
||||
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: 2324327699674677198}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -15.449997}
|
||||
m_SizeDelta: {x: 153, y: 30.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7204550795754971435
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9219898995569981882}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &8508423388133823952
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9219898995569981882}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9960785, g: 0.854902, b: 0.48235297, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 4
|
||||
m_MaxSize: 107
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 8/16
|
||||
|
|
|
|||
|
|
@ -1889,9 +1889,6 @@ RANK_TYPE = {
|
|||
|
||||
CELEBRATION_GUILD = 27,--社稷大典工会排行
|
||||
PERSON_CHALLENGE = 29,--四灵试炼人排行
|
||||
BUDDISH_CHALLENGE = 30,--四灵试炼佛排行
|
||||
DEMON_CHALLENGE = 31,--四灵试炼妖排行
|
||||
TAUISH_CHALLENGE = 32,--四灵试炼道排行
|
||||
}
|
||||
|
||||
--东海寻仙弹窗类型
|
||||
|
|
@ -2210,10 +2207,10 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[1
|
|||
[12] = { bgImage = "r_zjm_paihangbang_banner01", name = "森罗幻境" ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.slhjExper,isRankingMainPanelShow = false},
|
||||
[13] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[11033] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.Celebration,isRankingMainPanelShow = false},
|
||||
[14] = { bgImage = "r_zjm_paihangbang_banner01", name = "公会排行" ,rankType = RANK_TYPE.CELEBRATION_GUILD,activiteId = ActivityTypeDef.Celebration,isRankingMainPanelShow = false},
|
||||
[15] = { bgImage = "r_zjm_paihangbang_banner01", name = "人杰试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[16] = { bgImage = "r_zjm_paihangbang_banner01", name = "佛禅试炼排行" ,rankType = RANK_TYPE.BUDDISH_CHALLENGE,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[17] = { bgImage = "r_zjm_paihangbang_banner01", name = "妖灵试炼排行" ,rankType = RANK_TYPE.DEMON_CHALLENGE,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[18] = { bgImage = "r_zjm_paihangbang_banner01", name = "道玄试炼排行" ,rankType = RANK_TYPE.TAUISH_CHALLENGE,activiteId = 0,isRankingMainPanelShow = false},
|
||||
[15] = { bgImage = "r_zjm_paihangbang_banner01", name = "人杰试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 1,isRankingMainPanelShow = false},
|
||||
[16] = { bgImage = "r_zjm_paihangbang_banner01", name = "佛禅试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 2,isRankingMainPanelShow = false},
|
||||
[17] = { bgImage = "r_zjm_paihangbang_banner01", name = "妖灵试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 3,isRankingMainPanelShow = false},
|
||||
[18] = { bgImage = "r_zjm_paihangbang_banner01", name = "道玄试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 4,isRankingMainPanelShow = false},
|
||||
}
|
||||
|
||||
SoulPrintSpriteByQuantity={
|
||||
|
|
|
|||
|
|
@ -71,14 +71,10 @@ function this:OnShow(_parent,...)
|
|||
local args = {...}
|
||||
waveId = args[1]
|
||||
curType = args[2]
|
||||
myHeros = HeroManager.GetHeroDataByProperty(curType,0)
|
||||
this:SetMyHeightPower()
|
||||
configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"FloorId",waveId,"CampId",curType)
|
||||
this.titleText.text = FourElementName[curType]
|
||||
|
||||
friendHelpHeros = MonsterCampManager.GetFriendHelpHeros(curType)
|
||||
this:SortHeros(friendHelpHeros)
|
||||
myHeros = HeroManager.GetHeroDataByProperty(curType,0)
|
||||
this:SortHeros(myHeros)
|
||||
this:SetMyHeightPower()
|
||||
rate = tonumber(string.format("%.2f",ConfigManager.GetConfigData(ConfigName.CampTowerSetting,1).HelpFightMax / 10000))
|
||||
canHelpPower = heightPower*rate
|
||||
this:BtnClick(1)
|
||||
|
|
@ -104,33 +100,34 @@ function this:SetMyHeightPower()
|
|||
end
|
||||
|
||||
function this:RefreshItemData()
|
||||
local data = curIndex == 1 and friendHelpHeros or myHeros
|
||||
local data = nil
|
||||
if curIndex == 1 then
|
||||
data = friendHelpHeros
|
||||
else
|
||||
data = myHeros
|
||||
end
|
||||
if not data or #data < 1 then
|
||||
this.empty:SetActive(true)
|
||||
else
|
||||
this.empty:SetActive(false)
|
||||
return
|
||||
end
|
||||
this.empty:SetActive(false)
|
||||
this:SortHeros(data)
|
||||
this.ScrollView:SetData(data,function(index,go)
|
||||
--this:SetSingleData(index,go,data[index])
|
||||
LogGreen(go.name)
|
||||
local tempData = FourTrailSingleHelpHero:New(go)
|
||||
tempData:OnOpen(curIndex,data[index],curType)
|
||||
local tempId = 0
|
||||
if curIndex == 1 then
|
||||
tempId = data[index].hero.dynamicId
|
||||
else
|
||||
tempId = data[index].dynamicId
|
||||
end
|
||||
tempData:OnOpen(curIndex,data[index],curType,heightPower)
|
||||
local tempId = curIndex == 1 and data[index].hero.dynamicId or data[index].dynamicId
|
||||
itemList[tempId] = tempData
|
||||
end
|
||||
)
|
||||
end)
|
||||
end
|
||||
|
||||
function this:OnClose()
|
||||
|
||||
tabs = {}
|
||||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
tabs = {}
|
||||
itemList = {}
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -480,6 +480,7 @@ function this.ExecuteLoading()
|
|||
--[[[34] =]] function() XiaoYaoManager.GetOpenMapData(LoadingPanel.OnStep) end,
|
||||
function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end,
|
||||
function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end,
|
||||
function() MonsterCampManager.SetMyHelpHeroData(nil,nil,LoadingPanel.OnStep) end,
|
||||
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
|
||||
|
||||
if AppConst.isGuide then
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ local this = MonsterCampMainPanel
|
|||
local orginLayer
|
||||
local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup)
|
||||
local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig)
|
||||
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0)
|
||||
local trails = {}
|
||||
|
||||
--初始化组件(用于子类重写)
|
||||
|
|
@ -18,6 +19,7 @@ function MonsterCampMainPanel:InitComponent()
|
|||
table.insert(trails,Util.GetGameObject(self.gameObject, "Bg/SiLingDi/trail"..i))
|
||||
end
|
||||
this.btnShenYing = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/shenyingPro")
|
||||
this.btnShenYingText = Util.GetGameObject(this.btnShenYing, "Text"):GetComponent("Text")
|
||||
this.shenYingProgressText = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Text"):GetComponent("Text")
|
||||
this.shenYingProgressIma = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Image"):GetComponent("Image")
|
||||
end
|
||||
|
|
@ -60,6 +62,7 @@ function MonsterCampMainPanel:OnShow()
|
|||
local totalWaves = MonsterCampManager.GetFourElementTotalWave()
|
||||
local nextWaves = SacredTreeManager.NextAttriFloor()
|
||||
this.waveNum.text = MonsterCampManager.monsterWave
|
||||
this.btnShenYingText.text = SacredTreeManager.CulAttri().."/"..#attriConfig.PropertyUnlcokLevels
|
||||
this.shenYingProgressText = string.format("四灵试炼进度:%d/%d",totalWaves,nextWaves)
|
||||
this.shenYingProgressIma.fillAmount = totalWaves/nextWaves
|
||||
for i = 1,#trails do
|
||||
|
|
|
|||
|
|
@ -282,11 +282,9 @@ function this.UpdateHeroDatas(_msgHeroData)
|
|||
return heroData
|
||||
end
|
||||
|
||||
-----获得好友助战信息列表
|
||||
this.friendHelpHeros = {}
|
||||
function this.GetFriendHelpHeros(trailType)
|
||||
this.friendHelpHeros = {}
|
||||
|
||||
---好友助战 界面数据
|
||||
function this.GetFriendHelpHeros(trailType,func)
|
||||
this.friendHelpHeros = {}
|
||||
local x = function(msg)
|
||||
for k,v in ipairs(msg.helpHeros) do
|
||||
if not this.friendHelpHeros[v.trailType] then
|
||||
|
|
@ -310,15 +308,17 @@ function this.GetFriendHelpHeros(trailType)
|
|||
if trailType and this.friendHelpHeros[trailType] then
|
||||
return this.friendHelpHeros[trailType]
|
||||
end
|
||||
return {}
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
--设置好友帮助我的英雄 以试炼类型为键
|
||||
this.friendHelpHero = {}
|
||||
function this.SetFriendHelpHero(msg,trailType)
|
||||
function this.SetFriendHelpHero(helpFightList,trailType)
|
||||
if not trailType then
|
||||
this.friendHelpHero = {}
|
||||
for k,v in ipairs(msg.helpHeros) do
|
||||
for k,v in ipairs(helpFightList) do
|
||||
if not this.friendHelpHero[v.trailType] then
|
||||
this.friendHelpHero[v.trailType] = {}
|
||||
end
|
||||
|
|
@ -332,9 +332,9 @@ function this.SetFriendHelpHero(msg,trailType)
|
|||
if not this.friendHelpHero[trailType] then
|
||||
this.friendHelpHero[trailType] = {}
|
||||
end
|
||||
if msg then
|
||||
this.friendHelpHero[trailType].player = msg
|
||||
this.friendHelpHero[trailType].hero = this.UpdateHeroDatas(msg.hero)
|
||||
if helpFightList then
|
||||
this.friendHelpHero[trailType].player = helpFightList
|
||||
this.friendHelpHero[trailType].hero = this.UpdateHeroDatas(helpFightList.hero)
|
||||
else
|
||||
this.friendHelpHero[trailType] = nil
|
||||
end
|
||||
|
|
@ -350,12 +350,11 @@ function this.GetFriendHelpHero(trailType)
|
|||
end
|
||||
|
||||
--设置助战
|
||||
this.myHelpHeroData = {}
|
||||
function this.SetMyHelpHeroData(trail,_data)
|
||||
function this.SetMyHelpHeroData(trail,_data,func)
|
||||
if not trail then
|
||||
this.myHelpHeroData = {}
|
||||
local x = function(msg)
|
||||
for k,v in ipairs(msg.ids) do
|
||||
for k,v in ipairs(msg.helpHeros) do
|
||||
if not this.myHelpHeroData[v.trailType] then
|
||||
this.myHelpHeroData[v.trailType] = {}
|
||||
end
|
||||
|
|
@ -363,6 +362,7 @@ function this.SetMyHelpHeroData(trail,_data)
|
|||
end
|
||||
end
|
||||
--发协议获取 调用x
|
||||
NetManager.HelpFightListRequest(0,x)
|
||||
else
|
||||
if not this.myHelpHeroData then
|
||||
this.myHelpHeroData = {}
|
||||
|
|
@ -372,7 +372,11 @@ function this.SetMyHelpHeroData(trail,_data)
|
|||
end
|
||||
this.myHelpHeroData[trail] = _data
|
||||
end
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
end
|
||||
|
||||
--获取我的助战
|
||||
function this.GetFriendHelpHero(trailType)
|
||||
if this.myHelpHeroData[trailType] then
|
||||
|
|
|
|||
|
|
@ -186,6 +186,7 @@ function this.PlayerInfoRequest(func)
|
|||
-- 当前波次
|
||||
MonsterCampManager.monsterWave = msg.monsterAttackTime
|
||||
MonsterCampManager.SetRewardWave(msg.DemonsTrialRewardInfo)
|
||||
MonsterCampManager. SetFriendHelpHero(msg.helpFightList)
|
||||
OperatingManager.SetSignInData(msg.SignInInfo)
|
||||
|
||||
-- 无尽副本地图数据
|
||||
|
|
@ -214,6 +215,7 @@ function this.PlayerInfoRequest(func)
|
|||
QinglongSerectTreasureManager.SetLevel(msg.treasureLevel)
|
||||
QinglongSerectTreasureManager.SetTreasureBuyStatus(msg.hadBuyTreasure)
|
||||
PlayerManager.RefreshWorldLeveData(msg.worldLeve)
|
||||
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
|
|
@ -4841,4 +4843,18 @@ function NetManager.GetRePlayData(type,waveId,func)
|
|||
end)
|
||||
end
|
||||
|
||||
function NetManager.SetHelpHeroRequest(did,func)
|
||||
local data = PlayerInfoProto_pb.SetHelpHeroRequest()
|
||||
data.heroId = did
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.SetHelpHeroRequest , MessageTypeProto_pb.SetHelpHeroResponse , msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = PlayerInfoProto_pb.SetHelpHeroResponse()
|
||||
msg:ParseFromString(data)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -144,6 +144,9 @@ function this.SetRankingInfo()
|
|||
elseif sData.rankType == RANK_TYPE.CELEBRATION_GUILD then
|
||||
dData = { rankInfo = {param1 = myRankData.param1},
|
||||
score = myRankData.param1}
|
||||
elseif sData.rankType == RANK_TYPE.PERSON_CHALLENGE then
|
||||
dData = { rankInfo = {param1 = myRankData.param1},
|
||||
score = myRankData.param1}
|
||||
end
|
||||
this.SetInfoShow(this.infoGo,dData,sData.rankType)
|
||||
--数据拆分
|
||||
|
|
@ -405,6 +408,11 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
|||
Util.GetGameObject(go,"trial/Text"):GetComponent("Text").text = ""
|
||||
Util.GetGameObject(go,"trial"):GetComponent("Text").text = "贡献度:"..data.rankInfo.param1
|
||||
end
|
||||
elseif rankType == RANK_TYPE.PERSON_CHALLENGE then
|
||||
if data.rankInfo.param1 and data.rankInfo.param1 > 0 then
|
||||
fight:SetActive(true)
|
||||
fight:GetComponent("Text").text = "层数:"..data.rankInfo.param1
|
||||
end
|
||||
end
|
||||
end
|
||||
return RankingSingleListPanel
|
||||
|
|
@ -32,6 +32,7 @@ function FourTrailSingleHelpHero:OnOpen(curType,...)
|
|||
local player = {}
|
||||
local heroData = {}
|
||||
self.curType = args[2]
|
||||
self.heifhtPower = args[3]
|
||||
if curType == 1 then
|
||||
heroData = args[1].hero
|
||||
player = args[1].player
|
||||
|
|
@ -68,8 +69,8 @@ function FourTrailSingleHelpHero:SetIcon1(heroData)
|
|||
local tempData = MonsterCampManager.GetFriendHelpHero(self.curType)
|
||||
if tempData and heroData.dynamicId == tempData.hero.dynamicId then
|
||||
if tempData.state == 1 then
|
||||
self.select.sprite = Util.LoadSprite("r_hero_button_003")
|
||||
self.selectText.text = "已使用"
|
||||
self.select.sprite = Util.LoadSprite("s_silingshilian_yishiyong")
|
||||
self.selectText.text = ""
|
||||
end
|
||||
self.select.sprite = Util.LoadSprite("r_hero_button_003")
|
||||
self.selectText.text = "取消选择"
|
||||
|
|
@ -78,6 +79,14 @@ function FourTrailSingleHelpHero:SetIcon1(heroData)
|
|||
MonsterCampManager.SetFriendHelpHero(nil,self.curType)
|
||||
self:SetIcon1(heroData)
|
||||
end)
|
||||
elseif self.heifhtPower < heroData.warPower then
|
||||
self.select.sprite = Util.LoadSprite("s_silingshilian_zhanliguogao")
|
||||
self.selectText.text = ""
|
||||
Util.AddOnceClick(self.btn, function()
|
||||
--发协议
|
||||
MonsterCampManager.SetFriendHelpHero(nil,self.curType)
|
||||
self:SetIcon1(heroData)
|
||||
end)
|
||||
else
|
||||
self.select.sprite = Util.LoadSprite("r_hero_button_001")
|
||||
self.selectText.text = "选择神将"
|
||||
|
|
@ -85,7 +94,7 @@ function FourTrailSingleHelpHero:SetIcon1(heroData)
|
|||
if tempData and tempData.state == 0 then
|
||||
PopupTipPanel.ShowTip("已选择其他神将!")
|
||||
elseif tempData and tempData.state == 1 then
|
||||
PopupTipPanel.ShowTip("今日已无使用助战次数!")
|
||||
PopupTipPanel.ShowTip("今日已无使用助战次数!")
|
||||
else
|
||||
MonsterCampManager.SetFriendHelpHero(msg,self.curType)
|
||||
self:SetIcon1(heroData)
|
||||
|
|
@ -97,8 +106,8 @@ end
|
|||
function FourTrailSingleHelpHero:SetIcon2(heroData)
|
||||
local tempData = MonsterCampManager.GetFriendHelpHero(self.curType)
|
||||
if tempData and heroData.dynamicId == tempData.dynamicId then
|
||||
self.select.sprite = Util.LoadSprite("r_hero_button_003")
|
||||
self.selectText.text = "支援中"
|
||||
self.select.sprite = Util.LoadSprite("s_silingshilian_zhiyuanzhong")
|
||||
self.selectText.text = ""
|
||||
Util.AddOnceClick(self.btn, function()
|
||||
end)
|
||||
else
|
||||
|
|
@ -108,9 +117,11 @@ function FourTrailSingleHelpHero:SetIcon2(heroData)
|
|||
if tempData then
|
||||
PopupTipPanel.ShowTip("已选择支援神将!")
|
||||
else
|
||||
MonsterCampManager.SetMyHelpHeroData(self.curType,heroData)
|
||||
PopupTipPanel.ShowTip("已选择神将,获得XX金币!")
|
||||
self:SetIcon1(heroData)
|
||||
NetManager.SetHelpHeroRequest(heroData.dynamicId,function(msg)
|
||||
MonsterCampManager.SetMyHelpHeroData(self.curType,heroData)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1)
|
||||
self:SetIcon2(heroData)
|
||||
end)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue