Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
aa3c2f7694
|
|
@ -5323,7 +5323,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 57, y: -365}
|
||||
m_AnchoredPosition: {x: 62.5, y: -365}
|
||||
m_SizeDelta: {x: 129, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6020975154716938251
|
||||
|
|
@ -30609,7 +30609,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 58, y: -224.5}
|
||||
m_AnchoredPosition: {x: 63.5, y: -224}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2892560023550008126
|
||||
|
|
|
|||
|
|
@ -36892,8 +36892,8 @@ 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: 0.0015545, y: 41.719936}
|
||||
m_SizeDelta: {x: 192.63, y: 0}
|
||||
m_AnchoredPosition: {x: 4.8, y: 37.749943}
|
||||
m_SizeDelta: {x: 183.1, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &6680648963269486201
|
||||
CanvasRenderer:
|
||||
|
|
@ -42992,8 +42992,8 @@ 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: 0.22, y: 3.85}
|
||||
m_SizeDelta: {x: 192.63, y: 83.44}
|
||||
m_AnchoredPosition: {x: 0.22, y: -0.9}
|
||||
m_SizeDelta: {x: 192.6, y: 75.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &4105330798162488110
|
||||
MonoBehaviour:
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ function QianKunBox:contentShow()
|
|||
self.icons[i].kuang.sprite = self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[wishSoulData[i]].Quantity].circle)
|
||||
--点击能查看魂印信息
|
||||
Util.AddOnceClick(self.icons[i].kuang.gameObject,function ()
|
||||
UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,iconsData[i].Reward[1],nil,nil)
|
||||
UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,id,nil,nil)
|
||||
end)
|
||||
else
|
||||
self.icons[i].icon.gameObject:SetActive(false)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
IndicationManager = {}
|
||||
IndicationManager = {}
|
||||
local this = IndicationManager
|
||||
function this.Initialize()
|
||||
Game.GlobalEvent:AddEvent(Protocal.Connect, this.RegisterMessage)
|
||||
|
|
@ -169,18 +169,18 @@ function this.HongMengIndication(buffer)
|
|||
|
||||
if msg.hongmengTabletMax ~= 0 then
|
||||
-- body
|
||||
LogYellow("鸿蒙碑开启!!!!!!!!!```````````````````````````` "..msg.hongmengTabletMax)
|
||||
-- LogYellow("鸿蒙碑开启!!!!!!!!!```````````````````````````` "..msg.hongmengTabletMax)
|
||||
HarmonyManager:SetHongMengTowerUpLimit(msg.hongmengTabletMax)
|
||||
end
|
||||
if msg.hongmengGuards then
|
||||
LogError("鸿蒙阵更新数据的Indication..##msg.hongmengGuards:"..tostring(#msg.hongmengGuards))
|
||||
for i = 1, #msg.hongmengGuards do
|
||||
if msg.hongmengGuards[i].heroId == "" then
|
||||
Log("鸿蒙守卫:"..i.."为nil")
|
||||
else
|
||||
Log("鸿蒙守卫:"..i..HeroManager.GetSingleHeroData(msg.hongmengGuards[i].heroId).name)
|
||||
end
|
||||
end
|
||||
-- LogError("鸿蒙阵更新数据的Indication..##msg.hongmengGuards:"..tostring(#msg.hongmengGuards))
|
||||
-- for i = 1, #msg.hongmengGuards do
|
||||
-- if msg.hongmengGuards[i].heroId == "" then
|
||||
-- Log("鸿蒙守卫:"..i.."为nil")
|
||||
-- else
|
||||
-- Log("鸿蒙守卫:"..i..HeroManager.GetSingleHeroData(msg.hongmengGuards[i].heroId).name)
|
||||
-- end
|
||||
-- end
|
||||
HarmonyManager.UpdateHongMengDataGuards(msg.hongmengGuards)
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ function RecruitPanelNew:UpdataWishPanel()
|
|||
if RecruitManager.isTenRecruit == 0 then
|
||||
self.tenTipText.text = "<color=#FFB83B><size=30>首次十连</size><color=#FEDA90><size=30>必得</size></color></color><color=#FFB83B><size=30>五星</size></color><color=#FEDA90><size=30>神将</size></color>"
|
||||
else
|
||||
self.tenTipText.text = string.format("剩余%s次必得五星神将",RecruitManager.GetRecruit3MustCount())
|
||||
self.tenTipText.text = string.format("剩余<color=#31ff00>%s次</color>必得五星神将",RecruitManager.GetRecruit3MustCount())
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -351,6 +351,7 @@ function RecruitPanelNew:Recruit(recrutType,recrutId,bType)
|
|||
if bType == 1 then
|
||||
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],recrutId,bType,{self.config.ShopData[3][1],self.config.ShopData[3][2]})
|
||||
else
|
||||
RecruitManager.isTenRecruit = 1
|
||||
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,recrutId,bType,{self.config.ShopData[3][1],self.config.ShopData[3][2]})
|
||||
end
|
||||
CheckRedPointStatus(self.config.RpType)
|
||||
|
|
|
|||
Loading…
Reference in New Issue