[飞升]============飞升修改提交
parent
a16b592892
commit
853fde91b2
|
|
@ -164,7 +164,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -136, y: 45}
|
m_AnchoredPosition: {x: -136, y: 79}
|
||||||
m_SizeDelta: {x: 508, y: 47.8}
|
m_SizeDelta: {x: 508, y: 47.8}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1015799326
|
--- !u!222 &1015799326
|
||||||
|
|
@ -208,7 +208,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u6218\u6597\u7B2C\u4E00\u56DE\u5408\u5F00\u59CB\u524D\uFF0C\u81EA\u52A8\u83B7\u5F97\u81EA\u8EAB\u751F\u547D\u4E0A\u965020%\u7684\u5FA1\u7532\u6492\u4F9B\u5949\u7684\u662F\u5B98\u65B9\u7535\u8BDD\u5927\u4F7F\u9986\u72AF\u5F97\u4E0A\u5B89\u629A\u7684\u8428\u683C"
|
m_Text: "\u6218\u6597\u7B2C\u4E00\u56DE\u5408\u5F00\u59CB\u524D\uFF0C\u81EA\u52A8\u83B7\u5F97\u81EA\u8EAB\u751F\u547D\u4E0A\u965020%\u7684\u5FA1\u7532\u6492"
|
||||||
LanguageIndex: 11558
|
LanguageIndex: 11558
|
||||||
--- !u!1 &24498251168760438
|
--- !u!1 &24498251168760438
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
|
||||||
|
|
@ -20012,7 +20012,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -0.3000679, y: 93.04999}
|
m_AnchoredPosition: {x: 14, y: 93.04999}
|
||||||
m_SizeDelta: {x: 160, y: 30}
|
m_SizeDelta: {x: 160, y: 30}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &424374235
|
--- !u!222 &424374235
|
||||||
|
|
@ -20056,7 +20056,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u5929\u8D4B"
|
m_Text: "\u5929\u8D4B\u7684\u8428\u683C"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &424536942
|
--- !u!1 &424536942
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -20095,7 +20095,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -15, y: -31}
|
m_AnchoredPosition: {x: 0, y: -31}
|
||||||
m_SizeDelta: {x: 0, y: 100}
|
m_SizeDelta: {x: 0, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &424536945
|
--- !u!114 &424536945
|
||||||
|
|
@ -25433,7 +25433,7 @@ MonoBehaviour:
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u8D64\u708E\u836F\u5E08"
|
m_Text: "\u7389\u7687\u5927\u5E1D"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &541878351
|
--- !u!1 &541878351
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -79333,7 +79333,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: -48.975037}
|
m_AnchoredPosition: {x: 14, y: -48.975037}
|
||||||
m_SizeDelta: {x: 714.9, y: 197.9}
|
m_SizeDelta: {x: 714.9, y: 197.9}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &1206327824
|
--- !u!222 &1206327824
|
||||||
|
|
|
||||||
|
|
@ -445,7 +445,6 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor)
|
||||||
local go=img
|
local go=img
|
||||||
if _star>11 then
|
if _star>11 then
|
||||||
go.gameObject:SetActive(true)
|
go.gameObject:SetActive(true)
|
||||||
|
|
||||||
if effect==nil then
|
if effect==nil then
|
||||||
effect=poolManager:LoadAsset("c_long_touxiang_lizi", PoolManager.AssetType.GameObject)
|
effect=poolManager:LoadAsset("c_long_touxiang_lizi", PoolManager.AssetType.GameObject)
|
||||||
end
|
end
|
||||||
|
|
@ -482,7 +481,7 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor)
|
||||||
effect:SetActive(false)
|
effect:SetActive(false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
go :SetNativeSize()
|
go:SetNativeSize()
|
||||||
return effect
|
return effect
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -360,6 +360,7 @@ function this.HeadAdapter(head,data,type)
|
||||||
end
|
end
|
||||||
config.lv=data.roleData.star
|
config.lv=data.roleData.star
|
||||||
star=0
|
star=0
|
||||||
|
SetHeroFlyEffect(head,this.spLoader,0,this.sortingOrder+1,0.95)
|
||||||
else
|
else
|
||||||
if roleId > 10100 then
|
if roleId > 10100 then
|
||||||
local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId)
|
local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId)
|
||||||
|
|
@ -385,6 +386,7 @@ function this.HeadAdapter(head,data,type)
|
||||||
end
|
end
|
||||||
aa=config.Icon
|
aa=config.Icon
|
||||||
frameStr=GetHeroQuantityImageByquality(config.Quality, star)
|
frameStr=GetHeroQuantityImageByquality(config.Quality, star)
|
||||||
|
SetHeroFlyEffect(head,this.spLoader,data.roleData.star,this.sortingOrder+1,0.95)
|
||||||
end
|
end
|
||||||
-- 头像
|
-- 头像
|
||||||
frame.sprite = this.spLoader:LoadSprite(frameStr)
|
frame.sprite = this.spLoader:LoadSprite(frameStr)
|
||||||
|
|
@ -413,7 +415,6 @@ function this.HeadAdapter(head,data,type)
|
||||||
end
|
end
|
||||||
SetHeroStars(this.spLoader, starRoot, star,starType,starSize)
|
SetHeroStars(this.spLoader, starRoot, star,starType,starSize)
|
||||||
Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1)
|
Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1)
|
||||||
SetHeroFlyEffect(head,this.spLoader,data.roleData.star,this.sortingOrder+1,0.95)
|
|
||||||
-- 职业
|
-- 职业
|
||||||
prefess:SetActive(false)
|
prefess:SetActive(false)
|
||||||
-- 属性
|
-- 属性
|
||||||
|
|
|
||||||
|
|
@ -230,7 +230,6 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
||||||
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
|
live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true)
|
||||||
live.transform.localScale = Vector3.one
|
live.transform.localScale = Vector3.one
|
||||||
live.transform.localPosition = Vector3.zero
|
live.transform.localPosition = Vector3.zero
|
||||||
local flyImg=Util.GetGameObject(o,"flyImg"):GetComponent("Image")
|
|
||||||
if heroConfig.Toward==2 then
|
if heroConfig.Toward==2 then
|
||||||
SetHEeroLiveToward(live,1)
|
SetHEeroLiveToward(live,1)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ function FindTreasureDispatchPanel:InitComponent()
|
||||||
self.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
|
self.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
|
||||||
local v = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
|
local v = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect
|
||||||
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "scroll").transform,
|
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "scroll").transform,
|
||||||
self.cardPre, self.Scrollbar, Vector2.New(-v.x*2, -v.y), 1, 5, Vector2.New(25, 25))
|
self.cardPre, self.Scrollbar, Vector2.New(-v.x*2, -v.y), 1, 5, Vector2.New(25,35))
|
||||||
self.ScrollView.moveTween.MomentumAmount = 1
|
self.ScrollView.moveTween.MomentumAmount = 1
|
||||||
self.ScrollView.moveTween.Strength = 1
|
self.ScrollView.moveTween.Strength = 1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ function GeneralBigPopup_RoleGodSoulUp:InitComponent(gameObject)
|
||||||
local rootHight = self.Scroll.transform.rect.height
|
local rootHight = self.Scroll.transform.rect.height
|
||||||
local width = self.Scroll.transform.rect.width
|
local width = self.Scroll.transform.rect.width
|
||||||
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform,
|
self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.Scroll.transform,
|
||||||
self.itemPre,nil, Vector2.New(width, rootHight), 1, 5,Vector2.New(20, 10))
|
self.itemPre,nil, Vector2.New(width, rootHight), 1, 5,Vector2.New(20, 28))
|
||||||
self.ScrollView.moveTween.MomentumAmount = 1
|
self.ScrollView.moveTween.MomentumAmount = 1
|
||||||
self.ScrollView.moveTween.Strength = 2
|
self.ScrollView.moveTween.Strength = 2
|
||||||
self.ScrollView.elastic = false
|
self.ScrollView.elastic = false
|
||||||
|
|
@ -477,7 +477,7 @@ function GeneralBigPopup_RoleGodSoulUp:RefreshCostItemNums2(isAllRefresh)
|
||||||
starSize = Vector2.New(60,57)
|
starSize = Vector2.New(60,57)
|
||||||
end
|
end
|
||||||
SetHeroStars(self.spLoader,self.reSelectList[i].star,star,starType,starSize,starScale)
|
SetHeroStars(self.spLoader,self.reSelectList[i].star,star,starType,starSize,starScale)
|
||||||
SetHeroFlyEffect(self.reSelectList[i].go,self.spLoader,tempHeroData.star,sortingOrder+1,1,2)
|
SetHeroFlyEffect(self.reSelectList[i].btn,self.spLoader,tempHeroData.star,sortingOrder+1,1,3)
|
||||||
Util.SetParticleSortLayer(self.reSelectList[i].star,sortingOrder + 1)
|
Util.SetParticleSortLayer(self.reSelectList[i].star,sortingOrder + 1)
|
||||||
self.reSelectList[i].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(tempHeroData.heroConfig.PropertyName))
|
self.reSelectList[i].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(tempHeroData.heroConfig.PropertyName))
|
||||||
self.reSelectList[i].posIcon.sprite = self.spLoader:LoadSprite(tempHeroData.professionIcon)
|
self.reSelectList[i].posIcon.sprite = self.spLoader:LoadSprite(tempHeroData.professionIcon)
|
||||||
|
|
@ -487,7 +487,7 @@ function GeneralBigPopup_RoleGodSoulUp:RefreshCostItemNums2(isAllRefresh)
|
||||||
self.reSelectList[i].name.text = string.format("<color=#FFE18D>%s</color>",str)
|
self.reSelectList[i].name.text = string.format("<color=#FFE18D>%s</color>",str)
|
||||||
self.reSelectList[i].frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(self.costItems[i].star,self.costItems[i].star))
|
self.reSelectList[i].frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(self.costItems[i].star,self.costItems[i].star))
|
||||||
SetHeroStars(self.spLoader,self.reSelectList[i].star,self.costItems[i].star,1,Vector2.New(60,57))
|
SetHeroStars(self.spLoader,self.reSelectList[i].star,self.costItems[i].star,1,Vector2.New(60,57))
|
||||||
|
SetHeroFlyEffect(self.reSelectList[i].btn,self.spLoader,0,sortingOrder+1,1,3)
|
||||||
self.reSelectList[i].posIcon.gameObject:SetActive(false)
|
self.reSelectList[i].posIcon.gameObject:SetActive(false)
|
||||||
self.reSelectList[i].proIcon.gameObject:SetActive(false)
|
self.reSelectList[i].proIcon.gameObject:SetActive(false)
|
||||||
if self.costItems[i].id > 0 then
|
if self.costItems[i].id > 0 then
|
||||||
|
|
|
||||||
|
|
@ -324,7 +324,7 @@ function this.GetGodSoulData(curHeroData,lv,conditionIndex)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
table.insert(haveDatas,{state = index,herodata = v})
|
table.insert(haveDatas,{state = index,herodata = v,skinId=v.skinId})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -298,6 +298,11 @@ function this.OnSortingOrderChange()
|
||||||
Util.SetParticleSortLayer(starGrid,MapPanel.sortingOrder + 1)
|
Util.SetParticleSortLayer(starGrid,MapPanel.sortingOrder + 1)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if this.effectList then
|
||||||
|
for key, value in pairs(this.effectList) do
|
||||||
|
Util.SetParticleSortLayer(value,MapPanel.sortingOrder + 1)
|
||||||
|
end
|
||||||
|
end
|
||||||
Util.AddParticleSortLayer(this.chufa, MapPanel.sortingOrder - orginLayer)
|
Util.AddParticleSortLayer(this.chufa, MapPanel.sortingOrder - orginLayer)
|
||||||
orginLayer = MapPanel.sortingOrder
|
orginLayer = MapPanel.sortingOrder
|
||||||
end
|
end
|
||||||
|
|
@ -449,6 +454,7 @@ function TrialMapPanel:OnClose()
|
||||||
end
|
end
|
||||||
Util.ClearChild(this.s_grid.transform)
|
Util.ClearChild(this.s_grid.transform)
|
||||||
this.starGridList = {}
|
this.starGridList = {}
|
||||||
|
this.effectList={}
|
||||||
heroList={}
|
heroList={}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -458,6 +464,7 @@ function TrialMapPanel:OnDestroy()
|
||||||
SubUIManager.Close(this.upView)
|
SubUIManager.Close(this.upView)
|
||||||
-- 清空数据
|
-- 清空数据
|
||||||
this.starGridList = {}
|
this.starGridList = {}
|
||||||
|
this.effectList={}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -510,9 +517,15 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
|
||||||
if not this.starGridList then
|
if not this.starGridList then
|
||||||
this.starGridList = {}
|
this.starGridList = {}
|
||||||
end
|
end
|
||||||
|
if not this.effectList then
|
||||||
|
this.effectList={}
|
||||||
|
end
|
||||||
this.starGridList[i] = starGrid
|
this.starGridList[i] = starGrid
|
||||||
SetHeroStars(this.spLoader, starGrid, star,starType)
|
SetHeroStars(this.spLoader, starGrid, star,starType)
|
||||||
SetHeroFlyEffect(o,this.spLoader,v.star,MapPanel.sortingOrder - 100+1,1,2)
|
local effect=SetHeroFlyEffect(o,this.spLoader,v.star,MapPanel.sortingOrder+1,1,2)
|
||||||
|
if effect then
|
||||||
|
table.insert(this.effectList,effect)
|
||||||
|
end
|
||||||
Util.SetParticleSortLayer(starGrid,MapPanel.sortingOrder + 1)
|
Util.SetParticleSortLayer(starGrid,MapPanel.sortingOrder + 1)
|
||||||
--选择
|
--选择
|
||||||
if isFirstIn then
|
if isFirstIn then
|
||||||
|
|
|
||||||
|
|
@ -177,13 +177,13 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index)
|
||||||
end
|
end
|
||||||
SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType,starSize,starScale)
|
SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType,starSize,starScale)
|
||||||
Util.SetParticleSortLayer(self.Heros[index][hero.position].starGrid,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.Heros[index][hero.position].starGrid,self.sortingOrder + 1)
|
||||||
SetHeroFlyEffect(self.Heros[index][hero.position].hero,self.spLoader,heroData.star,self.sortingOrder+1,0.9)
|
SetHeroFlyEffect(self.Heros[index][hero.position].hero,self.spLoader,heroData.star,self.sortingOrder+1,0.9,2)
|
||||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
|
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroData.id)
|
||||||
allPower=allPower+heroData.warPower
|
allPower=allPower+heroData.warPower
|
||||||
self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
self.Heros[index][hero.position].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||||
self.Heros[index][hero.position].levelText.text = heroData.lv
|
self.Heros[index][hero.position].levelText.text = heroData.lv
|
||||||
self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
self.Heros[index][hero.position].frame.sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star))
|
||||||
SetHeroIcon(self.spLoader, hero,self.Heros[index][hero.position].icon,heroConfig)
|
SetHeroIcon(self.spLoader,heroData,self.Heros[index][hero.position].icon,heroConfig)
|
||||||
local heroData = {}
|
local heroData = {}
|
||||||
Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function()
|
Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function()
|
||||||
local heroData = HeroManager.GetSingleHeroData(hero.heroId)
|
local heroData = HeroManager.GetSingleHeroData(hero.heroId)
|
||||||
|
|
|
||||||
|
|
@ -168,6 +168,8 @@ function HarmonyView:SetItem(data,go,flag)
|
||||||
go.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.heroConfig.PropertyName))
|
go.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.heroConfig.PropertyName))
|
||||||
local star,starType = data.GetStar(1)
|
local star,starType = data.GetStar(1)
|
||||||
SetHeroStars(self.spLoader, go.starGrid, star,starType,nil,nil,Vector2.New(0,1))
|
SetHeroStars(self.spLoader, go.starGrid, star,starType,nil,nil,Vector2.New(0,1))
|
||||||
|
SetHeroFlyEffect(go.infoGo,self.spLoader,data.star,self.sortingOrder+1,1.2,0)
|
||||||
|
|
||||||
Util.SetParticleSortLayer(go.starGrid,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(go.starGrid,self.sortingOrder + 1)
|
||||||
else
|
else
|
||||||
go.infoGo:SetActive(false)
|
go.infoGo:SetActive(false)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue