From 853fde91b29faed65e2f0cbd097bfaf025372540 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 15 Jan 2022 12:26:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A3=9E=E5=8D=87]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=E9=A3=9E=E5=8D=87=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab | 4 ++-- .../UI/RoleInfo/RoleFlyUpSuccessPanel.prefab | 10 +++++----- Assets/ManagedResources/~Lua/Common/functions.lua | 3 +-- .../Modules/Battle/View/DamageResultPanel.lua | 3 ++- .../Expedition/View/MonsterCampFormationInfo.lua | 1 - .../FindTreasure/FindTreasureDispatchPanel.lua | 2 +- .../View/GeneralBigPopup_RoleGodSoulUp.lua | 6 +++--- .../~Lua/Modules/GodSoul/GodSoulManager.lua | 2 +- .../~Lua/Modules/Map/TrialMapPanel.lua | 15 ++++++++++++++- .../Modules/WorldArena/WorldArenaMyTeamPanel.lua | 4 ++-- Assets/ManagedResources/~Lua/View/HarmonyView.lua | 2 ++ 11 files changed, 33 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab index 205d1dba5d..dc291dbe20 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpLayout.prefab @@ -164,7 +164,7 @@ 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: -136, y: 45} + m_AnchoredPosition: {x: -136, y: 79} m_SizeDelta: {x: 508, y: 47.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1015799326 @@ -208,7 +208,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 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 --- !u!1 &24498251168760438 GameObject: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab index cef1dc03cb..7823e667da 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleFlyUpSuccessPanel.prefab @@ -20012,7 +20012,7 @@ 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.3000679, y: 93.04999} + m_AnchoredPosition: {x: 14, y: 93.04999} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &424374235 @@ -20056,7 +20056,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5929\u8D4B" + m_Text: "\u5929\u8D4B\u7684\u8428\u683C" LanguageIndex: 0 --- !u!1 &424536942 GameObject: @@ -20095,7 +20095,7 @@ 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: -15, y: -31} + m_AnchoredPosition: {x: 0, y: -31} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &424536945 @@ -25433,7 +25433,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u8D64\u708E\u836F\u5E08" + m_Text: "\u7389\u7687\u5927\u5E1D" LanguageIndex: 0 --- !u!1 &541878351 GameObject: @@ -79333,7 +79333,7 @@ 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, y: -48.975037} + m_AnchoredPosition: {x: 14, y: -48.975037} m_SizeDelta: {x: 714.9, y: 197.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1206327824 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 41ac63081b..cc06c57e1e 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -445,7 +445,6 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor) local go=img if _star>11 then go.gameObject:SetActive(true) - if effect==nil then effect=poolManager:LoadAsset("c_long_touxiang_lizi", PoolManager.AssetType.GameObject) end @@ -482,7 +481,7 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor) effect:SetActive(false) end end - go :SetNativeSize() + go:SetNativeSize() return effect end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index 1a8fe7c418..1c8faf9654 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -360,6 +360,7 @@ function this.HeadAdapter(head,data,type) end config.lv=data.roleData.star star=0 + SetHeroFlyEffect(head,this.spLoader,0,this.sortingOrder+1,0.95) else if roleId > 10100 then local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId) @@ -385,6 +386,7 @@ function this.HeadAdapter(head,data,type) end aa=config.Icon frameStr=GetHeroQuantityImageByquality(config.Quality, star) + SetHeroFlyEffect(head,this.spLoader,data.roleData.star,this.sortingOrder+1,0.95) end -- 头像 frame.sprite = this.spLoader:LoadSprite(frameStr) @@ -413,7 +415,6 @@ function this.HeadAdapter(head,data,type) end SetHeroStars(this.spLoader, starRoot, star,starType,starSize) Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) - SetHeroFlyEffect(head,this.spLoader,data.roleData.star,this.sortingOrder+1,0.95) -- 职业 prefess:SetActive(false) -- 属性 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua index c842a22a99..f3be61bea4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua @@ -230,7 +230,6 @@ function this.SetCardSingleData(o,monsterId, _pos) live.texture = CardRendererManager.GetSpineTexture(_pos, liveName, Vector3.one * scale, livePos, true) live.transform.localScale = Vector3.one live.transform.localPosition = Vector3.zero - local flyImg=Util.GetGameObject(o,"flyImg"):GetComponent("Image") if heroConfig.Toward==2 then SetHEeroLiveToward(live,1) end diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua index d4d4532db5..d799e508d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua @@ -37,7 +37,7 @@ function FindTreasureDispatchPanel:InitComponent() self.Scrollbar = Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") local v = Util.GetGameObject(self.gameObject, "scroll"):GetComponent("RectTransform").rect 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.Strength = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua index 5f773ca9c6..a3988df3f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RoleGodSoulUp.lua @@ -14,7 +14,7 @@ function GeneralBigPopup_RoleGodSoulUp:InitComponent(gameObject) local rootHight = self.Scroll.transform.rect.height local width = self.Scroll.transform.rect.width 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.Strength = 2 self.ScrollView.elastic = false @@ -477,7 +477,7 @@ function GeneralBigPopup_RoleGodSoulUp:RefreshCostItemNums2(isAllRefresh) starSize = Vector2.New(60,57) end 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) self.reSelectList[i].proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(tempHeroData.heroConfig.PropertyName)) 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("%s",str) 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)) - + SetHeroFlyEffect(self.reSelectList[i].btn,self.spLoader,0,sortingOrder+1,1,3) self.reSelectList[i].posIcon.gameObject:SetActive(false) self.reSelectList[i].proIcon.gameObject:SetActive(false) if self.costItems[i].id > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua index 57d9bf9c59..ffbf528c4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua @@ -324,7 +324,7 @@ function this.GetGodSoulData(curHeroData,lv,conditionIndex) end end - table.insert(haveDatas,{state = index,herodata = v}) + table.insert(haveDatas,{state = index,herodata = v,skinId=v.skinId}) end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 96831970d8..3b914f1a09 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -298,6 +298,11 @@ function this.OnSortingOrderChange() Util.SetParticleSortLayer(starGrid,MapPanel.sortingOrder + 1) 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) orginLayer = MapPanel.sortingOrder end @@ -449,6 +454,7 @@ function TrialMapPanel:OnClose() end Util.ClearChild(this.s_grid.transform) this.starGridList = {} + this.effectList={} heroList={} end @@ -458,6 +464,7 @@ function TrialMapPanel:OnDestroy() SubUIManager.Close(this.upView) -- 清空数据 this.starGridList = {} + this.effectList={} end @@ -510,9 +517,15 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) if not this.starGridList then this.starGridList = {} end + if not this.effectList then + this.effectList={} + end this.starGridList[i] = starGrid 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) --选择 if isFirstIn then diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua index 77b47622e4..30ac3349db 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMyTeamPanel.lua @@ -177,13 +177,13 @@ function WorldArenaMyTeamPanel:SetSingleFormation(go,data,index) end SetHeroStars(self.spLoader, self.Heros[index][hero.position].starGrid, star,starType,starSize,starScale) 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) allPower=allPower+heroData.warPower 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].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 = {} Util.AddOnceClick(self.Heros[index][hero.position].icon.gameObject, function() local heroData = HeroManager.GetSingleHeroData(hero.heroId) diff --git a/Assets/ManagedResources/~Lua/View/HarmonyView.lua b/Assets/ManagedResources/~Lua/View/HarmonyView.lua index 1df84a5351..45403b4231 100644 --- a/Assets/ManagedResources/~Lua/View/HarmonyView.lua +++ b/Assets/ManagedResources/~Lua/View/HarmonyView.lua @@ -168,6 +168,8 @@ function HarmonyView:SetItem(data,go,flag) go.proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(data.heroConfig.PropertyName)) local star,starType = data.GetStar(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) else go.infoGo:SetActive(false)