diff --git a/Assets/ManagedResources/EffectResUI/ChengHao/Prefab/WaiBao/UI_Effect_MianBan_ChengHao_Tslx.prefab b/Assets/ManagedResources/EffectResUI/ChengHao/Prefab/WaiBao/UI_Effect_MianBan_ChengHao_Tslx.prefab index 10da0b7593..a5c595c8c3 100644 --- a/Assets/ManagedResources/EffectResUI/ChengHao/Prefab/WaiBao/UI_Effect_MianBan_ChengHao_Tslx.prefab +++ b/Assets/ManagedResources/EffectResUI/ChengHao/Prefab/WaiBao/UI_Effect_MianBan_ChengHao_Tslx.prefab @@ -34,8 +34,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: 51.3, y: -18.4} - m_SizeDelta: {x: 119.94, y: 27.05} + m_AnchoredPosition: {x: 149, y: -48.7} + m_SizeDelta: {x: 341, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1132923677645108674 CanvasRenderer: @@ -108,8 +108,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: 2.600006, y: 0.79999995} - m_SizeDelta: {x: 59, y: 30.28} + m_AnchoredPosition: {x: 27, y: -8} + m_SizeDelta: {x: 189, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5321366442432868700 CanvasRenderer: @@ -182,8 +182,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: -6.400013, y: 17.800001} - m_SizeDelta: {x: 41.16, y: 25.53} + m_AnchoredPosition: {x: -16.5, y: 47.8} + m_SizeDelta: {x: 100, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5845775655478747632 CanvasRenderer: @@ -256,8 +256,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.945, y: 6.65} - m_SizeDelta: {x: 91.39, y: 63.84} + m_AnchoredPosition: {x: -1.5, y: 22.9} + m_SizeDelta: {x: 262, y: 183} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9073209497045217543 CanvasRenderer: @@ -326,12 +326,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6583037773972955281} - m_RootOrder: 0 + m_RootOrder: 1 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: 4.7000084, y: 10.150002} - m_SizeDelta: {x: 47.91, y: 25.51} + m_AnchoredPosition: {x: 25.3, y: 26.1} + m_SizeDelta: {x: 139, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5010518425905007883 CanvasRenderer: @@ -400,12 +400,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6583037773972955281} - m_RootOrder: 1 + m_RootOrder: 0 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: 6.100006, y: 17.7} - m_SizeDelta: {x: 41.16, y: 25.53} + m_AnchoredPosition: {x: 19, y: 47.8} + m_SizeDelta: {x: 100, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1436832246423731016 CanvasRenderer: @@ -483,7 +483,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: -263, y: 0} + m_AnchoredPosition: {x: 7, y: 338} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4320119772942752865 @@ -515,16 +515,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4186588760406050927} - {fileID: 4384711900372688937} + - {fileID: 4186588760406050927} - {fileID: 4038881973805554802} m_Father: {fileID: 6361193509961736898} m_RootOrder: 1 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: 56.5, y: -3.5} - m_SizeDelta: {x: 51.1, y: 120.19} + m_AnchoredPosition: {x: 169.4, y: -1} + m_SizeDelta: {x: 142, y: 334} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &467346800080587274 CanvasRenderer: @@ -597,8 +597,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: 2.8, y: -2.5} - m_SizeDelta: {x: 94.4, y: 34.81} + m_AnchoredPosition: {x: 2.8, y: -4.6} + m_SizeDelta: {x: 301, y: 111} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &388150026587559559 CanvasRenderer: @@ -672,7 +672,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -2.6, y: -2.5000024} - m_SizeDelta: {x: 231.78, y: 34.81} + m_SizeDelta: {x: 679, y: 102} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1320880432443759543 CanvasRenderer: @@ -745,8 +745,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: -4.6999817, y: 10.150002} - m_SizeDelta: {x: 47.91, y: 25.51} + m_AnchoredPosition: {x: -23, y: 26.1} + m_SizeDelta: {x: 139, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3665775806159325267 CanvasRenderer: @@ -819,8 +819,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: -3.299984, y: 0.79999995} - m_SizeDelta: {x: 59, y: 30.28} + m_AnchoredPosition: {x: -26.5, y: -8} + m_SizeDelta: {x: 189, y: 97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5838263596515546595 CanvasRenderer: @@ -893,8 +893,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: -49.72, y: -18.4} - m_SizeDelta: {x: 119.94, y: 27.05} + m_AnchoredPosition: {x: -152.2, y: -49.2} + m_SizeDelta: {x: 341, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6467723488531960664 CanvasRenderer: @@ -970,8 +970,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: -53.1, y: -3.5} - m_SizeDelta: {x: 51.1, y: 120.19} + m_AnchoredPosition: {x: -169.1, y: -1} + m_SizeDelta: {x: 142, y: 334} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3293460568127758488 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua index 0c9e9ed855..aa07837f7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua @@ -45,10 +45,10 @@ function this:InitComponent(gameObject) this.returnLook=Util.GetGameObject(gameObject,"returnLook") this.returnLook.gameObject:SetActive(false) this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text") - Util.GetGameObject(gameObject, "RoleGrid/FrontImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(("bd_xinqianpai_zh") - Util.GetGameObject(gameObject, "RoleGrid/BehindImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite(("bd_xinhoupai_zh") - this.returnLook:GetComponent("Image").sprite = this.spLoader:LoadSprite(("s_silingshilian_huifanganniu_zh") - Util.GetGameObject(gameObject, "Power"):GetComponent("Image").sprite = this.spLoader:LoadSprite(("t_tongyong-zhanli_zh") + Util.GetGameObject(gameObject, "RoleGrid/FrontImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinqianpai_zh") + Util.GetGameObject(gameObject, "RoleGrid/BehindImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("bd_xinhoupai_zh") + this.returnLook:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_huifanganniu_zh") + Util.GetGameObject(gameObject, "Power"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh") end function this:BindEvent() @@ -129,7 +129,7 @@ function this:SetIcon() Util.SetGray(this.sureBtn,false) this.fightBtnIcon.gameObject:SetActive(false) this.fightBtnNum.gameObject:SetActive(false) - this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(("r_hero_button_002") + this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_button_002") this.tip.text = "奖励" if waveId == MonsterCampManager.monsterWave - 1 then if freeTime > 0 then @@ -137,7 +137,7 @@ function this:SetIcon() else this.fightBtnIcon.gameObject:SetActive(true) this.fightBtnNum.gameObject:SetActive(true) - this.fightBtnIcon.sprite = this.spLoader:LoadSprite((GetResourcePath(itemConfig[itemId].ResourceID)) + this.fightBtnIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[itemId].ResourceID)) local color = 0 if BagManager.GetItemCountById(itemId) < costNum then color = "E71515" @@ -151,7 +151,7 @@ function this:SetIcon() end end elseif (waveId == MonsterCampManager.monsterWave) then - this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(("r_hero_button_001") + this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_button_001") this.fightBtnText.text = string.format("%s","17232A","挑 战") else this.fightBtnText.text =string.format("%s","17232A","确定") @@ -176,7 +176,7 @@ function this:FormationAdapter() local bossTeaminfo = ConfigManager.GetConfigData(ConfigName.MonsterGroup,configData.Monster).Contents[1] for i = 1, #heroListGo do if (bossTeaminfo[i]) and bossTeaminfo[i] > 0 then - heroListGo[i].transform.parent:GetComponent("Image").sprite= this.spLoader:LoadSprite(("t_chengyuankuang_kuang") + heroListGo[i].transform.parent:GetComponent("Image").sprite= this.spLoader:LoadSprite("t_chengyuankuang_kuang") this.SetCardSingleData(heroListGo[i],bossTeaminfo[i],i) heroListGo[i]:SetActive(true) else @@ -206,16 +206,16 @@ function this.SetCardSingleData(o,monsterId, _pos) local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterconfig.MonsterId) local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") - bg.sprite = this.spLoader:LoadSprite((GetHeroCardStarBg[heroConfig.Star]) + bg.sprite = this.spLoader:LoadSprite(GetHeroCardStarBg[heroConfig.Star]) local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image") - fg.sprite = this.spLoader:LoadSprite((GetHeroCardStarFg[heroConfig.Star]) + fg.sprite = this.spLoader:LoadSprite(GetHeroCardStarFg[heroConfig.Star]) -- local live=Util.GetGameObject(o,"Mask/Live") local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text") lv.text=monsterconfig.Level local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image") - pro.sprite= this.spLoader:LoadSprite((GetProStrImageByProNum(heroConfig.PropertyName)) + pro.sprite= this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) local starGrid=Util.GetGameObject(o,"StarGrid") SetCardStars(starGrid,heroConfig.Star) local name=Util.GetGameObject(o,"Name/Text"):GetComponent("Text") @@ -236,7 +236,7 @@ function this.SetCardSingleData(o,monsterId, _pos) zs:SetActive(false) else zs:SetActive(true) - zs:GetComponent("Image").sprite = this.spLoader:LoadSprite((zsName) + zs:GetComponent("Image").sprite = this.spLoader:LoadSprite(zsName) end if heroConfig.Star > 9 then @@ -251,6 +251,7 @@ function this:OnClose() end function this:OnDestroy() + this.spLoader:Destroy() end