Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
cef99194af
|
@ -9780,7 +9780,7 @@ ParticleSystem:
|
|||
startDelay:
|
||||
serializedVersion: 2
|
||||
minMaxState: 0
|
||||
scalar: 3.2
|
||||
scalar: 0
|
||||
minScalar: 0
|
||||
maxCurve:
|
||||
serializedVersion: 2
|
||||
|
|
|
@ -484,9 +484,9 @@ 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: -280.3, y: -131.6}
|
||||
m_SizeDelta: {x: 519.5, y: 159.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -131.6}
|
||||
m_SizeDelta: {x: 540, y: 159.6}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!1 &396130673485725596
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -3467,8 +3467,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.46741, y: -1.6}
|
||||
m_SizeDelta: {x: 392.77, y: 138.8}
|
||||
m_AnchoredPosition: {x: 0.86, y: 1.4928}
|
||||
m_SizeDelta: {x: 395.43, y: 138.58}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2990390581569018762
|
||||
CanvasRenderer:
|
||||
|
@ -12650,8 +12650,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.47, y: 0.00048816}
|
||||
m_SizeDelta: {x: 392.77, y: 135.6}
|
||||
m_AnchoredPosition: {x: 0.85996, y: 1.4916}
|
||||
m_SizeDelta: {x: 395.43, y: 138.58}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7096263496067464868
|
||||
CanvasRenderer:
|
||||
|
@ -16981,7 +16981,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1094151485460785958
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
@ -109,7 +109,7 @@ function SupremeHeroPopup:InitComponent()
|
|||
this.panelist[i].jianEffect = Util.GetGameObject(this.panelist[i].jian, "Effect_UI_SupremeHeroPopup_jian")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_daohen = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_daohen")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_renwuchuxian")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_changzhu = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_daohen")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_changzhu = Util.GetGameObject(this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian, "Particle System")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian.gameObject:SetActive(true)
|
||||
elseif i == 2 then
|
||||
this.panelist[i].jianEffect = Util.GetGameObject(this.panelist[i].role, "Image/fx_yujiantongxing_01")
|
||||
|
@ -127,6 +127,7 @@ end
|
|||
function this.LoadLive2D()
|
||||
local liveId = ActivityGiftManager.GetActivityDataById(42).Drawing
|
||||
heroId = liveId or 10011
|
||||
heroData = heroConfig[heroId]
|
||||
liveId = heroConfig[heroId].Live
|
||||
this.clickName.text = GetLanguageStrById(heroConfig[heroId].ReadingName)
|
||||
SetTextVerTial(this.clickName,Vector3.New(59,-10,0))
|
||||
|
@ -224,6 +225,7 @@ function SupremeHeroPopup:OnShow()
|
|||
else
|
||||
curPage = 1
|
||||
end
|
||||
--curPage = 2
|
||||
this.InitShowPanel()
|
||||
this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(1))
|
||||
this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(2))
|
||||
|
@ -243,7 +245,6 @@ end
|
|||
|
||||
function this.InitShow()
|
||||
ActivityGiftManager.isFirstForSupremeHero = true
|
||||
--heroData = heroConfig[heroId]
|
||||
|
||||
actIsOpen = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0
|
||||
actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||
|
@ -279,9 +280,15 @@ function this.SetMissionData()
|
|||
if i == curPage then
|
||||
if v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then
|
||||
elseif isFrist then
|
||||
if v.gameObject.name == "Particle System" then
|
||||
Timer.New(function()
|
||||
v.gameObject:SetActive(true)
|
||||
end,3.2):Start()
|
||||
else
|
||||
Timer.New(function()
|
||||
v.gameObject:SetActive(true)
|
||||
end,3.6):Start()
|
||||
end
|
||||
else
|
||||
v.gameObject:SetActive(true)
|
||||
end
|
||||
|
@ -293,6 +300,9 @@ function this.SetMissionData()
|
|||
end
|
||||
end
|
||||
end
|
||||
Timer.New(function()
|
||||
isFrist = false
|
||||
end,4):Start()
|
||||
if curPage == 1 then
|
||||
this.previewBtn.gameObject:SetActive(true)
|
||||
else
|
||||
|
|
|
@ -45,8 +45,10 @@ function SettingPlayerRide:InitComponent(gameObject)
|
|||
|
||||
this.proPre = Util.GetGameObject(gameObject, "skinProInfo/proPre")
|
||||
this.proGrid = Util.GetGameObject(gameObject, "skinProInfo/proGrid")
|
||||
local rootHight = this.proGrid.transform.rect.height
|
||||
local width = this.proGrid.transform.rect.width
|
||||
this.scrollViewPro=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.proGrid.transform,this.proPre,
|
||||
nil,Vector2.New(458.2,159.6),1,2,Vector2.New(0,0))
|
||||
nil,Vector2.New(width,rootHight),1,2,Vector2.New(0,0))
|
||||
this.scrollViewPro.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0)
|
||||
this.scrollViewPro.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
|
||||
this.scrollViewPro.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
|
||||
|
@ -103,7 +105,6 @@ end
|
|||
--显示信息
|
||||
function this.ShowPanelData()
|
||||
local rideList = ConfigManager.GetAllConfigsDataByKey(ConfigName.PlayerHeadIcon,"Type",PlayerHeadIconType.Ride)
|
||||
LogGreen("rideList:"..#rideList)
|
||||
--设置滚动区信息
|
||||
curUserRideId = PlayerManager.GetPlayerRide()
|
||||
curUserRideConFig = rideList[1]
|
||||
|
@ -165,7 +166,7 @@ function this.SingleRideClickShowInfo(data,go)
|
|||
this.getInfo.text = GetLanguageStrById(curPlayerHeadIconConfig.ItemDescribe)
|
||||
this.scrollViewPro:SetData(curPlayerHeadIconConfig.UnlockProperty,function(index,root)
|
||||
local propertyConfig = ConfigManager.GetConfigData(ConfigName.PropertyConfig, curPlayerHeadIconConfig.UnlockProperty[index][1])
|
||||
Util.GetGameObject(root, "proValue"):GetComponent("Text").text = GetLanguageStrById(propertyConfig.Info).." ".. GetPropertyFormatStr(propertyConfig.Style, curPlayerHeadIconConfig.UnlockProperty[index][2])
|
||||
Util.GetGameObject(root, "proValue"):GetComponent("Text").text = GetLanguageStrById(propertyConfig.Info)..GetPropertyFormatStr(propertyConfig.Style, curPlayerHeadIconConfig.UnlockProperty[index][2])
|
||||
end, not false, not false)
|
||||
this.stateImgGo:SetActive(true)
|
||||
if not isGet and not isUser then
|
||||
|
|
|
@ -92,23 +92,11 @@ function XiaoYaoLuckyTurnTablePopup:test(itemId)
|
|||
this.turnEffect2:Stop()
|
||||
this.turnEffect2 = nil
|
||||
end
|
||||
this.turnEffect2 = Timer.New(function()
|
||||
for i = 1 , 10 do
|
||||
this:tableTurnEffect(1/t)
|
||||
t=t+5
|
||||
end,0.1,10,true)
|
||||
this.turnEffect2:Start()
|
||||
coroutine.wait(1)
|
||||
-- --减速阶段
|
||||
-- if this.turnEffect2 then
|
||||
-- this.turnEffect2:Stop()
|
||||
-- this.turnEffect2 = nil
|
||||
-- end
|
||||
-- this.turnEffect2 = Timer.New(function()
|
||||
-- this:tableTurnEffect(1/t)
|
||||
-- t=t-3.3
|
||||
-- end,0.1,10,true)
|
||||
-- this.turnEffect2:Start()
|
||||
-- coroutine.wait(1)
|
||||
coroutine.wait(0.1)
|
||||
end
|
||||
this:tableTurnEffect(0.1,itemId)
|
||||
end)
|
||||
end
|
||||
|
@ -132,7 +120,6 @@ function XiaoYaoLuckyTurnTablePopup:tableTurnEffect(speed,itemId)
|
|||
SoundManager.PlaySound(SoundConfig.Sound_zp)
|
||||
SoundManager.PlaySound(SoundConfig.UI_Xingyunzhuanpan)
|
||||
index = index + 1
|
||||
--LogGreen("index == "..index)
|
||||
--检测最后的奖励
|
||||
if itemId and index == itemId then
|
||||
this.turnEffect:Stop()
|
||||
|
|
Loading…
Reference in New Issue