diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayLootPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayLootPopup.prefab index be9582142b..ef69c355ad 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayLootPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayLootPopup.prefab @@ -164,6 +164,8 @@ GameObject: m_Component: - component: {fileID: 9125051718642985024} - component: {fileID: 6024467483199800400} + - component: {fileID: 3126515562848536902} + - component: {fileID: 2135374944480882136} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -219,6 +221,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &3126515562848536902 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511795738199973468} + m_CullTransparentMesh: 0 +--- !u!114 &2135374944480882136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511795738199973468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &704408148085766512 GameObject: m_ObjectHideFlags: 0 @@ -3074,6 +3113,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 842710462875940317} + - component: {fileID: 5477365116923167796} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -3100,6 +3140,29 @@ RectTransform: m_AnchoredPosition: {x: -20.109772, y: -15.803474} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0, y: 0} +--- !u!114 &5477365116923167796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4395002867097042595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &4431560829826084519 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index c3167e4b29..67f4e5d9d8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -62711,7 +62711,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 99.70001, y: 50} + m_SizeDelta: {x: 166.5, y: 50} m_Pivot: {x: 0, y: 0} --- !u!114 &3850136345842701056 MonoBehaviour: @@ -105115,7 +105115,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: diff --git a/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab index ff49ec911b..4baf20e109 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/ShowEnemyInfoPanel.prefab @@ -486,7 +486,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -2058,6 +2058,7 @@ GameObject: m_Component: - component: {fileID: 4539812938182687137} - component: {fileID: 7730639954261135584} + - component: {fileID: 4797394340802752982} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -2092,6 +2093,29 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6347993739599404022} m_CullTransparentMesh: 0 +--- !u!114 &4797394340802752982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6347993739599404022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &6537675973867770291 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 954ce4ebe9..712141bc5e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -16563,6 +16563,7 @@ GameObject: - component: {fileID: 5461938130620850700} - component: {fileID: 6652145005786524880} - component: {fileID: 5636204288674061176} + - component: {fileID: 7629045132395946949} m_Layer: 5 m_Name: Grid m_TagString: Untagged @@ -16621,6 +16622,35 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!114 &7629045132395946949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2999162040435534594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3011764581667822422 GameObject: m_ObjectHideFlags: 0 @@ -36094,6 +36124,7 @@ GameObject: m_Component: - component: {fileID: 2141172695676843135} - component: {fileID: 4536685851633023705} + - component: {fileID: 5382143816429989394} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -36115,11 +36146,11 @@ RectTransform: m_Father: {fileID: 8506003241810201444} m_RootOrder: 5 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: -69, y: -69} - m_SizeDelta: {x: 239.96, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 3.9100037, y: 5} + m_SizeDelta: {x: 140, y: 30} + m_Pivot: {x: 0, y: 0} --- !u!222 &4536685851633023705 CanvasRenderer: m_ObjectHideFlags: 0 @@ -36128,6 +36159,29 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7014052985923824080} m_CullTransparentMesh: 0 +--- !u!114 &5382143816429989394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7014052985923824080} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &7093571060650879715 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua index 15f3095c41..57d9bf9c59 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua @@ -229,7 +229,6 @@ function this.GetGodSoulDataByLv(id,lv,conditionIndex) else return this.GodSoulTableData[id][lv] end - end return {} end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index 86da97b516..1d26bc8c2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -133,7 +133,15 @@ function this.SingleInfoDataShow(go,data) Util.GetGameObject(heroGo, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curHeroConfig.PropertyName)) Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(nil,data.teamInfo[i].star)) local star,starType = GetStarOrGodSoulLv(1,data.teamInfo[i]) - SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType) + local starSize = Vector2.New(35,35) + local starScale = -17.78 + if starType == 3 then + starSize = Vector2.New(0.8,-15) + starScale = -13.56 + elseif starType == 2 then + starSize = Vector2.New(60,60) + end + SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), star,starType,starSize,starScale) Util.SetParticleSortLayer(Util.GetGameObject(heroGo, "starGrid"),origilayer + 1) Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text=data.teamInfo[i].level local heroData = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua index 32967fc25c..a646db699b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua @@ -356,7 +356,7 @@ function this.FormationAdapter(teamInfo) -- local config = ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",hero.skinId) -- this.Demons[hero.position].heroicon:GetComponent("Image.sprite = this.spLoader:LoadSprite(GetResourcePath(config.Icon)) -- end - SetHeroIcon(this.spLoader, hero,this.Demons[hero.position].heroicon,heroConfig) + SetHeroIcon(this.spLoader, hero,this.Demons[hero.position].icon,heroConfig) local heroData = {} Util.AddOnceClick( this.Demons[hero.position].frame.gameObject, function() NetManager.ViewHeroInfoRequest(this._MemId,hero.heroid,nil,FormationTypeDef.FORMATION_NORMAL,function(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua index 0cb21994f7..dc40fdc7eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/ShowEnemyInfoPanel.lua @@ -176,7 +176,7 @@ function this.SetSelectHero() local icon=Util.GetGameObject(item,"icon"):GetComponent("Image") local pro=Util.GetGameObject(item,"proIcon"):GetComponent("Image") local lv=Util.GetGameObject(item,"lv/Text"):GetComponent("Text") - local star=Util.GetGameObject(item,"star") + local starGrid=Util.GetGameObject(item,"star") local choosed=Util.GetGameObject(item,"choosed") local hpExp=Util.GetGameObject(item,"hpExp"):GetComponent("Slider") frame.sprite=this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroConfig[value.tmpId].Quality,value.star)) @@ -189,8 +189,9 @@ function this.SetSelectHero() SetHeroIcon(this.spLoader, value,icon,heroConfig[value.tmpId]) pro.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig[value.tmpId].PropertyName)) lv.text=value.level - SetHeroStars(this.spLoader, star, value.star) - + local star,starType = GetStarOrGodSoulLv(1,value) + SetHeroStars(this.spLoader, starGrid, star,starType) + Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) --选择 choosed:SetActive(MapTrialManager.selectHeroDid==value.heroId) Util.AddOnceClick(item,function()