Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
5eea8ada97
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -106,10 +106,10 @@ RectTransform:
|
|||
m_Father: {fileID: 224688690836167678}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 1.8000488, y: -2.0996094}
|
||||
m_SizeDelta: {x: 87.6, y: 180.8}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 1080, y: 1920}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222210643621885542
|
||||
CanvasRenderer:
|
||||
|
@ -178,8 +178,9 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 224910525349788610}
|
||||
- {fileID: 224937005449219178}
|
||||
- {fileID: 224582139656678132}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -4922,12 +4923,12 @@ RectTransform:
|
|||
- {fileID: 224359105046491170}
|
||||
- {fileID: 224353427390833726}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -960}
|
||||
m_SizeDelta: {x: 1080, y: 1920}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222881125231045872
|
||||
CanvasRenderer:
|
||||
|
@ -4966,7 +4967,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -5496,7 +5497,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 224649179437051262}
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
|
@ -5594,9 +5595,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224999014420418594}
|
||||
m_RootOrder: 3
|
||||
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: 0, y: 508}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -452}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1436945794551186
|
||||
|
@ -5879,6 +5880,7 @@ GameObject:
|
|||
- component: {fileID: 222036411659404812}
|
||||
- component: {fileID: 223618104105950242}
|
||||
- component: {fileID: 114980318143548070}
|
||||
- component: {fileID: 4391644773385436668}
|
||||
m_Layer: 5
|
||||
m_Name: RoleEquipPanel
|
||||
m_TagString: Untagged
|
||||
|
@ -5897,12 +5899,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 6022608408297022691}
|
||||
- {fileID: 224688690836167678}
|
||||
- {fileID: 224999014420418594}
|
||||
- {fileID: 224146012743359964}
|
||||
- {fileID: 224269591239545434}
|
||||
- {fileID: 224330976962607446}
|
||||
- {fileID: 224582139656678132}
|
||||
- {fileID: 224358324289722092}
|
||||
- {fileID: 8296304076087632614}
|
||||
- {fileID: 8773920232323521874}
|
||||
|
@ -5972,6 +5974,20 @@ MonoBehaviour:
|
|||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &4391644773385436668
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1506380704721022}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7fdc50ec1a2f1534f93155e67c3708ab, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
bgList:
|
||||
- {fileID: 110908547457684246}
|
||||
--- !u!1 &1509409260145998
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6963,9 +6979,9 @@ RectTransform:
|
|||
m_Father: {fileID: 224999014420418594}
|
||||
m_RootOrder: 2
|
||||
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: 4, y: 509}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 4, y: -451}
|
||||
m_SizeDelta: {x: 178, y: 426}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222177478867076372
|
||||
|
@ -12731,12 +12747,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224444569024407278}
|
||||
m_RootOrder: 5
|
||||
m_Father: {fileID: 224688690836167678}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -899}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 61}
|
||||
m_SizeDelta: {x: 1047.7, y: 6.3599854}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &222286758884224434
|
||||
|
|
|
@ -6,6 +6,10 @@ local activityId
|
|||
--live2D位置和大小
|
||||
local NamePosSize = {
|
||||
[10040] = {name = "live2d_c_yj_00040" , size = Vector3.one*0.8 , pos = Vector2.New(231,-333)},
|
||||
[10086] = {name = "live2d_c_0001" , size = Vector3.one*0.8 , pos = Vector2.New(174,-926)},
|
||||
[10090] = {name = "live2d_c_0001" , size = Vector3.one*0.8 , pos = Vector2.New(174,-926)},
|
||||
[10091] = {name = "live2d_c_bgj_00091" , size = Vector3.one*0.8 , pos = Vector2.New(137,-769)},
|
||||
[10092] = {name = "live2d_c_gy_00092" , size = Vector3.one*0.8 , pos = Vector2.New(171,-1060)},
|
||||
}
|
||||
|
||||
function ShengXingYouLi:New(gameObject)
|
||||
|
|
|
@ -206,9 +206,9 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterconfig.MonsterId)
|
||||
|
||||
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
|
||||
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[heroConfig.Star])
|
||||
bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[monsterconfig.Star])
|
||||
local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image")
|
||||
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroConfig.Star])
|
||||
fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[monsterconfig.Star])
|
||||
|
||||
-- local live=Util.GetGameObject(o,"Mask/Live")
|
||||
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
|
||||
|
@ -217,7 +217,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image")
|
||||
pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
local starGrid=Util.GetGameObject(o,"StarGrid")
|
||||
SetCardStars(starGrid,heroConfig.Star)
|
||||
SetCardStars(starGrid,monsterconfig.Star)
|
||||
local name=Util.GetGameObject(o,"Name/Text"):GetComponent("Text")
|
||||
name.text=heroConfig.ReadingName
|
||||
|
||||
|
@ -231,7 +231,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
live.transform.localPosition = Vector3.zero
|
||||
|
||||
local zs = Util.GetGameObject(o, "zs")
|
||||
local zsName = GetHeroCardStarZs[heroConfig.Star]
|
||||
local zsName = GetHeroCardStarZs[monsterconfig.Star]
|
||||
if zsName == "" then
|
||||
zs:SetActive(false)
|
||||
else
|
||||
|
@ -239,19 +239,18 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
zs:GetComponent("Image").sprite = this.spLoader:LoadSprite(zsName)
|
||||
end
|
||||
|
||||
if heroConfig.Star > 9 then
|
||||
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
|
||||
else
|
||||
Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
|
||||
end
|
||||
local effect = Util.GetGameObject(o,"UI_Effect_jinkuang_KaPai")
|
||||
effect.gameObject:SetActive(monsterconfig.Star > 9)
|
||||
Util.SetParticleSortLayer(effect.gameObject, sortingOrder + 1)
|
||||
end
|
||||
|
||||
function this:OnClose()
|
||||
sortingOrder = 0
|
||||
rewardData = {}
|
||||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
|
||||
sortingOrder = 0
|
||||
this.spLoader:Destroy()
|
||||
end
|
||||
|
||||
|
|
|
@ -678,7 +678,7 @@ function this.RefreshBtnCountDown()
|
|||
if BagManager.GetItemCountById(63)>0 then
|
||||
--显示免费刷新
|
||||
this.SetRefreshBtnShowState(true)
|
||||
this.freeRefreshTime.text=" 0:00:00"
|
||||
this.freeRefreshTime.text=" "
|
||||
else
|
||||
--显示道具刷新
|
||||
this.SetRefreshBtnShowState(false)
|
||||
|
|
|
@ -210,6 +210,7 @@ end
|
|||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function MonsterCampNewPanel:OnShow()
|
||||
this.sortingOrder = self.sortingOrder
|
||||
this.OnShowPanel()
|
||||
end
|
||||
function this.OnShowPanel()
|
||||
|
@ -229,7 +230,7 @@ function this.SingleDataShow(go, data)
|
|||
local singledata = MonsterCampSingleWave:New(go)
|
||||
go:GetComponent("RectTransform").sizeDelta=Vector2.New(screenwidth,380)
|
||||
singledata:InitComponent(go,data)
|
||||
singledata:OnOpen()
|
||||
singledata:OnOpen(this.sortingOrder)
|
||||
return singledata
|
||||
end
|
||||
|
||||
|
|
|
@ -192,7 +192,9 @@ function this.HongMengIndication(buffer)
|
|||
local msg = HeroInfoProto_pb.HongmengInfoIndication()
|
||||
msg:ParseFromString(data)
|
||||
|
||||
if msg.hongmengTabletMax ~= 0 then
|
||||
local data = ConfigManager.GetConfigData(ConfigName.SpecialConfig,101).Value
|
||||
local d = string.split(data,"#")
|
||||
if msg.hongmengTabletMax >= tonumber(d[2]) then
|
||||
-- body
|
||||
-- LogYellow("鸿蒙碑开启!!!!!!!!!```````````````````````````` "..msg.hongmengTabletMax)
|
||||
HarmonyManager:SetHongMengTowerUpLimit(msg.hongmengTabletMax)
|
||||
|
|
|
@ -84,6 +84,7 @@ function RewardTalismanSingleShowPopup:BindEvent()
|
|||
-- self:SendBackResolveReCallBack(drop)
|
||||
-- end)
|
||||
-- end
|
||||
self:ClosePanel()
|
||||
JumpManager.GoJump(24005)
|
||||
end)
|
||||
end
|
||||
|
|
|
@ -32,6 +32,7 @@ function this:InitComponent(gameObject)
|
|||
this.scrollView.moveTween.Strength = 2
|
||||
this.preList={}
|
||||
this.currHeroIds={}
|
||||
this.itemList = {}
|
||||
end
|
||||
|
||||
function this:BindEvent()
|
||||
|
@ -77,17 +78,20 @@ function this:OnShow(_parent,...)
|
|||
end
|
||||
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 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
|
||||
this.scrollView:ForeachItemGO(function(index, go)
|
||||
go.gameObject:SetActive(false)
|
||||
end)
|
||||
this.scrollView:SetData(heroDatas,function(index,root)
|
||||
this.SingleHeroDataShow(root,heroDatas[index])
|
||||
end)
|
||||
|
@ -98,16 +102,20 @@ end
|
|||
function this.SingleHeroDataShow(go,_heroData)
|
||||
local heroData = _heroData
|
||||
local _go = go
|
||||
Util.SetParticleSortLayer(go, sortingOrder+1)
|
||||
_go.gameObject:SetActive(true)
|
||||
Util.GetGameObject(_go.transform, "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quantity))
|
||||
Util.GetGameObject(_go.transform, "icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(artResourcesConfig[_heroData.ResourceID].Name)
|
||||
local pos = Util.GetGameObject(_go.transform, "pos")
|
||||
local btn = Util.GetGameObject(_go.transform, "btn")
|
||||
if not this.itemList[go] then
|
||||
this.itemList[go] = SubUIManager.Open(SubUIConfig.ItemView,pos.transform)
|
||||
end
|
||||
this.itemList[go].gameObject:SetActive(true)
|
||||
this.itemList[go]:OnOpen(false,{heroData.Id,0},1,true,false,false,sortingOrder+1)
|
||||
|
||||
local selectObj=Util.GetGameObject(_go.transform, "choosed"):GetComponent("Image")
|
||||
selectObj.sprite=this.spLoader:LoadSprite("r_chouka_yixuanding")
|
||||
local cardclickBtn = Util.GetGameObject(_go.transform, "icon")
|
||||
local isHave=BattleUtil.ChecklistIsContainValue(this.currHeroIds,heroData.Id)
|
||||
selectObj.gameObject:SetActive(isHave)
|
||||
Util.AddOnceClick(cardclickBtn, function()
|
||||
Util.AddOnceClick(btn, function()
|
||||
if #this.currHeroIds==3 and not isHave then
|
||||
PopupTipPanel.ShowTip("只可选择3枚心愿魂印")
|
||||
return
|
||||
|
@ -123,7 +131,7 @@ function this.SingleHeroDataShow(go,_heroData)
|
|||
selectObj.gameObject:SetActive(isHave)
|
||||
end)
|
||||
|
||||
Util.AddLongPressClick(cardclickBtn, function()
|
||||
Util.AddLongPressClick(btn, function()
|
||||
UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,heroData.Id,nil,nil)
|
||||
end, 0.5)
|
||||
end
|
||||
|
@ -137,6 +145,10 @@ end
|
|||
function this:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
this.scrollView=nil
|
||||
for k,v in pairs(this.itemList) do
|
||||
SubUIManager.Close(v)
|
||||
end
|
||||
this.itemList = {}
|
||||
end
|
||||
|
||||
return this
|
|
@ -18,19 +18,17 @@ function MonsterCampSingleWave:InitComponent(go,_data)
|
|||
self.hero = Util.GetGameObject(go,"bg/Hero")
|
||||
self.frame=Util.GetGameObject(self.hero,"Bg1"):GetComponent("Image")
|
||||
self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("RawImage")
|
||||
-- self.icon=Util.GetGameObject(self.hero, "Mask/icon"):GetComponent("Image")
|
||||
self.lv = Util.GetGameObject(self.hero, "lv/Text"):GetComponent("Text")
|
||||
self.pro = Util.GetGameObject(self.hero, "Pro/Image"):GetComponent("Image")
|
||||
self.fg = Util.GetGameObject(self.hero,"Bg2"):GetComponent("Image")
|
||||
--self.starGrid = Util.GetGameObject(self.hero,"starGrid")
|
||||
self.starGrid = Util.GetGameObject(self.hero,"StarGrid")
|
||||
self.name=Util.GetGameObject(self.hero,"Name/Text"):GetComponent("Text")
|
||||
self.effect = Util.GetGameObject(self.hero,"UI_Effect_jinkuang_KaPai")
|
||||
|
||||
|
||||
self.reward = Util.GetGameObject(go,"bg/rewardRect")
|
||||
self.fight = Util.GetGameObject(go,"bg/fight")
|
||||
self.pass = Util.GetGameObject(go,"bg/pass"):GetComponent("Image")
|
||||
-- self.title = Util.GetGameObject(go,"bg/leftLayout/title"):GetComponent("Image")
|
||||
self.rewardText = Util.GetGameObject(self.reward,"Text"):GetComponent("Text")
|
||||
self.fightBtnIcon = Util.GetGameObject(self.fight,"layout/icon"):GetComponent("Image")
|
||||
self.fightBtnNum = Util.GetGameObject(self.fight,"layout/num"):GetComponent("Text")
|
||||
|
@ -38,7 +36,7 @@ function MonsterCampSingleWave:InitComponent(go,_data)
|
|||
self.fightBtnMask = Util.GetGameObject(self.fight,"mask"):GetComponent("Image")
|
||||
self.bg = Util.GetGameObject(go,"bg"):GetComponent("Image")
|
||||
self.rewardGrid = Util.GetGameObject(self.reward,"grid")
|
||||
|
||||
|
||||
self.btn=Util.GetGameObject(go,"bg/btn")
|
||||
self.data = _data
|
||||
Util.GetGameObject(self.hero, "finishImage"):GetComponent("Image").sprite = self.spLoader:LoadSprite("s_silingshilian_yitongguan_zh")
|
||||
|
@ -50,8 +48,8 @@ function MonsterCampSingleWave:InitComponent(go,_data)
|
|||
end
|
||||
end
|
||||
|
||||
function MonsterCampSingleWave:OnOpen()
|
||||
self:UpdatePrivilage()
|
||||
function MonsterCampSingleWave:OnOpen(_sortingOrder)
|
||||
self:UpdatePrivilage()
|
||||
self.Id.text = "第"..self.data.Id.."层"
|
||||
self.power.text = self.data.Force
|
||||
self.bg.sprite = self.spLoader:LoadSprite("s_silingshilian_shiliandi")
|
||||
|
@ -66,30 +64,10 @@ function MonsterCampSingleWave:OnOpen()
|
|||
self.reward.gameObject:SetActive(true)
|
||||
else
|
||||
self.reward.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
self.effect.gameObject:SetActive(false)--因为穿透,所以关闭了
|
||||
Util.SetParticleSortLayer(self.effect.gameObject, _sortingOrder + 1)
|
||||
|
||||
-- if self.data.Id < MonsterCampManager.monsterWave then
|
||||
-- self.fight.gameObject:SetActive(false)
|
||||
-- self.reward.gameObject:SetActive(false)
|
||||
-- else
|
||||
-- self.fight.gameObject:SetActive(true)
|
||||
-- self.rewardText.text = "挑战奖励"
|
||||
|
||||
-- self:SetIcon()
|
||||
-- self.rewardData = self.data.RewardShow
|
||||
-- if self.rewardData and #self.rewardData then
|
||||
-- self:InitShowReward()
|
||||
-- self.reward.gameObject:SetActive(true)
|
||||
-- else
|
||||
-- self.reward.gameObject:SetActive(false)
|
||||
-- end
|
||||
-- end
|
||||
-- Util.AddOnceClick(self.pass.gameObject, function()
|
||||
-- UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.data.Id)
|
||||
-- end)
|
||||
-- Util.AddOnceClick(self.hero, function()
|
||||
-- UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.data.Id)
|
||||
-- end)
|
||||
Util.AddOnceClick(self.btn, function()
|
||||
UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.data.Id)
|
||||
end)
|
||||
|
@ -103,7 +81,7 @@ function MonsterCampSingleWave:OnOpen()
|
|||
self:UpdatePrivilage()
|
||||
CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp)
|
||||
end)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
if self.data.Id == MonsterCampManager.monsterWave - 1 then--扫荡
|
||||
LogGreen(self.freeTimes..self.buyTimes)
|
||||
|
@ -129,42 +107,6 @@ function MonsterCampSingleWave:OnOpen()
|
|||
elseif self.data.Id == MonsterCampManager.monsterWave then--挑战
|
||||
UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.MONSTER_CAMP)
|
||||
end
|
||||
|
||||
|
||||
-- if self.data.Id == MonsterCampManager.monsterWave - 1 then
|
||||
-- LogGreen(self.freeTimes..self.buyTimes)
|
||||
-- if self.freeTimes <=0 and self.buyTimes <= 0 then
|
||||
-- PopupTipPanel.ShowTip("今日已无扫荡次数!")
|
||||
-- return
|
||||
-- end
|
||||
-- LogGreen(self.itemId.." "..self.costNum)
|
||||
-- if self.freeTimes <= 0 then
|
||||
-- if BagManager.GetItemCountById(self.itemId) < self.costNum then
|
||||
-- PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[self.itemId].Name))
|
||||
-- return
|
||||
-- end
|
||||
-- MsgPanel.ShowTwo(string.format("是否花费%s%s购买一次扫荡次数?",self.costNum,itemConfig[self.itemId].Name),function() end,function()
|
||||
-- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,self.storeDataId,1,function()
|
||||
-- PrivilegeManager.RefreshPrivilegeUsedTimes(self.trailData.buyTimeId, 1)
|
||||
-- x()
|
||||
-- end)
|
||||
-- end,"取消","确定")
|
||||
-- else
|
||||
-- x()
|
||||
-- end
|
||||
-- elseif self.data.Id == self.trailData.monsterWave + 1 then
|
||||
-- if self.trailData.canFightTime > 0 then
|
||||
-- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 1700)) > 0 then
|
||||
-- MonsterCampManager.ExecuteFightBattle(self.data.Id,0,nil,self.trailData.fourElementType)
|
||||
-- else
|
||||
-- -- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.Id)
|
||||
-- UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.MONSTER_CAMP)
|
||||
-- end
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip("今日已无可挑战层数!")
|
||||
-- end
|
||||
-- --UIManager.OpenPanel(UIName.ExpeditionMonsterInfoPopup,EXPEDITON_POPUP_TYPE.FourElementMonster,self.trailData.fourElementType,self.data.Id)
|
||||
-- end
|
||||
end)
|
||||
end
|
||||
-- 初始化奖励显示
|
||||
|
@ -194,7 +136,6 @@ function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData)
|
|||
self.icon.transform.localPosition = Vector3.zero
|
||||
self.lv.text = monConfig.Level
|
||||
self.pro.sprite= self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
--self.icon.sprite = self.spLoader:LoadSprite(heroData.painting)
|
||||
SetCardStars(self.starGrid,monConfig.Star)
|
||||
self.fg.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[monConfig.Star])
|
||||
self.name.text = heroData.ReadingName
|
||||
|
@ -202,7 +143,6 @@ end
|
|||
|
||||
function MonsterCampSingleWave:UpdatePrivilage()
|
||||
self.storeDataId,self.itemId,self.costNum = MonsterCampManager.MonsterCampGetCost()
|
||||
-- self.freeTimes,self.buyTimes = MonsterCampManager.GetTimeTip(self.trailData.fourElementType)
|
||||
self.freeTimes = MonsterCampManager.GetCanBattleCount()
|
||||
self.buyTimes = MonsterCampManager.GetCanBuyBattleCount()
|
||||
self:SetIcon()
|
||||
|
@ -219,7 +159,6 @@ function MonsterCampSingleWave:SetIcon()
|
|||
if self.data.Id < MonsterCampManager.monsterWave - 1 then
|
||||
self.finishImage.gameObject:SetActive(true)
|
||||
elseif self.data.Id == MonsterCampManager.monsterWave - 1 then--扫荡
|
||||
-- self.rewardText.text = "扫荡奖励"
|
||||
self.fight.gameObject:SetActive(true)
|
||||
self.hero.transform.localPosition = Vector3.New(0,3,0)
|
||||
if self.freeTimes > 0 then
|
||||
|
@ -235,8 +174,8 @@ function MonsterCampSingleWave:SetIcon()
|
|||
self.fightBtnIcon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[self.itemId].ResourceID))
|
||||
if self.buyTimes < 1 then
|
||||
Util.SetGray(self.fight,true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif self.data.Id == MonsterCampManager.monsterWave then--挑战
|
||||
self.fight.gameObject:SetActive(true)
|
||||
self.hero.transform.localPosition = Vector3.New(0,3,0)
|
||||
|
|
Loading…
Reference in New Issue