From 52726874dd0f0802b2b990eb4b812384badd0c28 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Fri, 8 Dec 2023 23:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E6=B5=B7=E5=8E=86=E7=BB=83=E7=9B=B8?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpeditionMonsterInfoPopup.prefab | 28 +++++++++---------- .../FourElementMonsterCampPanel.prefab | 18 ++++++------ .../~Lua/Common/GlobalDefine.lua | 10 +++---- .../View/MonsterCampFormationInfo.lua | 2 +- .../Expedition/View/MonsterFormationInfo.lua | 16 +++++------ 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index 9013b83c8e..a1de854cd1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -243233,10 +243233,10 @@ RectTransform: m_Father: {fileID: 5672185311229191161} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 107.875, y: -30} - m_SizeDelta: {x: 87, y: 51} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4723865784122906103 CanvasRenderer: @@ -906330,10 +906330,10 @@ RectTransform: m_Father: {fileID: 5672185311229191161} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 196.6875, y: -30} - m_SizeDelta: {x: 90.625, y: 51} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6112033298577141693 CanvasRenderer: @@ -1209410,7 +1209410,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1266753377350954170 RectTransform: m_ObjectHideFlags: 0 @@ -1224716,10 +1224716,10 @@ RectTransform: m_Father: {fileID: 5672185311229191161} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 37.1875, y: -30} - m_SizeDelta: {x: 54.375, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7895360677212913353 CanvasRenderer: @@ -2010840,7 +2010840,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2423823732879755494 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab index 7250946392..413fc16ef9 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/FourElementMonsterCampPanel.prefab @@ -10164,7 +10164,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2496563612955233788 RectTransform: m_ObjectHideFlags: 0 @@ -10182,8 +10182,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.44, y: 3} - m_SizeDelta: {x: 325.92, y: 126.69} + m_AnchoredPosition: {x: -46, y: 35} + m_SizeDelta: {x: 325.9, y: 83.345} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2265878109357873099 CanvasRenderer: @@ -10213,7 +10213,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bed0f3ecb49860b44b7fc53703900f59, type: 3} + m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -37733,7 +37733,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} + m_Color: {r: 0.047169805, g: 0.047169805, b: 0.047169805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -37741,11 +37741,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 47 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 26 + m_MinSize: 4 m_MaxSize: 47 m_Alignment: 4 m_AlignByGeometry: 0 @@ -52829,7 +52829,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7392497996747905421 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cf6381bc84..db7a718093 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3076,10 +3076,10 @@ rankKingList={ [1] = { bgImage = "UI_hz_ls_47", name = "星数排行" ,rankType [24] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 24}, [25] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 25}, [26] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 26}, - [27] = { bgImage = "r_zjm_paihangbang_banner01", name = "人杰试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 1,isRankingMainPanelShow = false}, - [28] = { bgImage = "r_zjm_paihangbang_banner01", name = "佛禅试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 2,isRankingMainPanelShow = false}, - [29] = { bgImage = "r_zjm_paihangbang_banner01", name = "妖灵试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 3,isRankingMainPanelShow = false}, - [30] = { bgImage = "r_zjm_paihangbang_banner01", name = "道玄试炼排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 4,isRankingMainPanelShow = false}, + [27] = { bgImage = "r_zjm_paihangbang_banner01", name = "西海历练排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 1,isRankingMainPanelShow = false}, + [28] = { bgImage = "r_zjm_paihangbang_banner01", name = "南海历练排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 2,isRankingMainPanelShow = false}, + [29] = { bgImage = "r_zjm_paihangbang_banner01", name = "东海历练排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 3,isRankingMainPanelShow = false}, + [30] = { bgImage = "r_zjm_paihangbang_banner01", name = "北海历练排行" ,rankType = RANK_TYPE.PERSON_CHALLENGE,activiteId = 4,isRankingMainPanelShow = false}, [31] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.WORLDARENA,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 10}, --车迟斗法 [35] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, @@ -3152,7 +3152,7 @@ Pokemon_Formation_RefreshType={ DownZhen = 2,--下阵 Replace = 3,--替换 } -FourElementName = {"西海历练","东海历练","南海历练","北海历练"} +FourElementName = {"西海历练","南海历练","东海历练","北海历练"} FourElementNameImage = {"s_silingshilian_renjiezi_zh","s_silingshilian_fochanzi_zh","s_silingshilian_yaolingzi_zh","s_silingshilian_daoxuanzi_zh"} NumConvertWeek = {[1]=Language[10001],[2]=Language[10002],[3]=Language[10003],[4]=Language[10004],[5]=Language[10005],[6]=Language[10006],[7]=Language[10335]} diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua index 301121fc8c..64cafb32bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterCampFormationInfo.lua @@ -223,7 +223,7 @@ function this.SetCardSingleData(o,monsterId, _pos) local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage") live.transform.rotation=Vector3.New(0,0,0) - local liveName = GetResourcePath(heroConfig.Live) + local liveName = GetResourcePath(heroConfig.Painting) local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id) local scale = roleConfig.play_liveScale local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2]+300, 0) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua index 2bf2dbaa43..b55471295f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua @@ -32,7 +32,7 @@ function this:InitComponent(gameObject) --滚动条根节点 this.root = Util.GetGameObject(gameObject, "Root") for i = 1, 6 do - heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero") + heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i) Util.GetGameObject(gameObject, "RoleGrid/Bg"..i):GetComponent("Image").sprite = this.spLoader:LoadSprite(CardPosImageName[i]) end this.backBtn=Util.GetGameObject(gameObject,"BackBtn") @@ -45,10 +45,10 @@ function this:InitComponent(gameObject) this.returnLook=Util.GetGameObject(gameObject,"returnLook") this.returnLook.gameObject:SetActive(true) 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("UI_hz_RankList_RankBg") + Util.GetGameObject(gameObject, "RoleGrid/BehindImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_RankList_RankBg") + this.returnLook:GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_zhonghe05_104") + Util.GetGameObject(gameObject, "Power"):GetComponent("Image").sprite = this.spLoader:LoadSprite("UI_hz_shenjiang_15_zh") end function this:BindEvent() @@ -123,7 +123,7 @@ function this:SetIcon() Util.SetGray(this.fightBtn,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("Btn_hz_cheng_01") if waveId == data.monsterWave then this.tip.text = "扫荡奖励" if freeTime > 0 then @@ -146,7 +146,7 @@ function this:SetIcon() end elseif (waveId == data.monsterWave + 1) then this.tip.text = "战斗奖励" - this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_button_001") + this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("Btn_hz_cheng_01") this.fightBtnText.text = string.format("%s","17232A","挑 战") else this.tip.text = "战斗奖励" @@ -233,7 +233,7 @@ function this.SetCardSingleData(o,monsterId, _pos) name.text=heroConfig.ReadingName local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage") - local liveName = GetResourcePath(heroConfig.Live) + local liveName = GetResourcePath(heroConfig.Painting) local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id) local scale = roleConfig.play_liveScale local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0)