From 16b471cfe8ab39a635f7ae9e10be02bf1aaf94c4 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 6 Jan 2025 19:55:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=8A=E5=8D=97=E8=AA=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/PlayerInfoPopup.prefab | 36 +++++++++---------- .../TailsmanSoulMainPanel.prefab | 8 ++--- .../~Lua/Common/GlobalDefine.lua | 2 +- .../MonsterCamp/MonsterCampMainPanel.lua | 7 ++-- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab index eb07bde130..1a47d64547 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab @@ -20913,7 +20913,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -34.52} + m_AnchoredPosition: {x: 0, y: -34.520004} m_SizeDelta: {x: 234, y: 69.05} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4120350516855940403 @@ -34431,7 +34431,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.008850098, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3258353433143064439 @@ -45036,8 +45036,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 716, y: -50} - m_SizeDelta: {x: 266, y: 80} + m_AnchoredPosition: {x: 716, y: -65} + m_SizeDelta: {x: 266, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2849758744561567391 CanvasRenderer: @@ -49856,7 +49856,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.000017382597, y: 10} + m_AnchoredPosition: {x: 0.008844113, y: 10} m_SizeDelta: {x: 0, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8072862713034857029 @@ -50472,8 +50472,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 440, y: -50} - m_SizeDelta: {x: 266, y: 80} + m_AnchoredPosition: {x: 440, y: -65} + m_SizeDelta: {x: 266, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9080103864262957761 CanvasRenderer: @@ -92229,8 +92229,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 7.7} + m_SizeDelta: {x: -60, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7191386585327907655 CanvasRenderer: @@ -104159,7 +104159,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.000017382597, y: 10} + m_AnchoredPosition: {x: 0.008844113, y: 10} m_SizeDelta: {x: 0, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2834337415833886244 @@ -121120,8 +121120,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 7.700001} + m_SizeDelta: {x: -60, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6601203260030786348 CanvasRenderer: @@ -126283,8 +126283,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 7.7} + m_SizeDelta: {x: -60, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6707219798943956176 CanvasRenderer: @@ -159141,8 +159141,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 164, y: -50} - m_SizeDelta: {x: 266, y: 80} + m_AnchoredPosition: {x: 164, y: -65} + m_SizeDelta: {x: 266, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6567597392025691424 CanvasRenderer: @@ -171862,7 +171862,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.000018538776, y: 0} + m_AnchoredPosition: {x: 0.008842956, y: 0} m_SizeDelta: {x: 0, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1473205862085400439 @@ -233457,7 +233457,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 441.25, y: -1019.93} + m_AnchoredPosition: {x: 441.25, y: -2008.0801} m_SizeDelta: {x: 880, y: 95.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4976320884223371891 diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab index a7aeca41cc..db815dcaf1 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsmanSoulMainPanel.prefab @@ -726,7 +726,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: 178.9, y: 114.73543} + m_AnchoredPosition: {x: 178.9, y: 114.74129} m_SizeDelta: {x: 308.4, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &5086809663402702269 @@ -22095,7 +22095,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 15.8, y: -34.75} + m_AnchoredPosition: {x: 0, y: -28.126} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4308442783885688322 @@ -22142,7 +22142,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 0a607ef861fe8a24e9c6079e935099b8, type: 3} - m_FontSize: 34 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -29003,7 +29003,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.012145996} + m_AnchoredPosition: {x: 0, y: -0.0075683594} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6617612647759148344 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 7c47d23df8..e4b962edae 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3178,7 +3178,7 @@ Pokemon_Formation_RefreshType={ } FourElementName = {Language[13266],Language[13267],Language[13268],Language[13269]} 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[10381]} +NumConvertWeek = {[1]=Language[13168],[2]=Language[13169],[3]=Language[13170],[4]=Language[13171],[5]=Language[13172],[6]=Language[13173],[7]=Language[13174]} CompShowType = { a = 1, diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua index 990db32696..57c9446c37 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua @@ -113,10 +113,11 @@ function this:GetOpenTime(id) isFunction = true else if isFunction then + if str then - str = str .. Language[10382] .. NumConvertWeek[tonumber(m)] + str = str .. "," .. NumConvertWeek[tonumber(m)] else - str = Language[10383] .. NumConvertWeek[tonumber(m)] + str = NumConvertWeek[tonumber(m)] end end end @@ -139,7 +140,7 @@ function MonsterCampMainPanel:SetSingleTrailData(go, data) canFightWave.text = string.format("%s", "64450B", data.canFightTime) end - openTime.text = this:GetOpenTime(data.fourElementType) .. Language[10353] + openTime.text = this:GetOpenTime(data.fourElementType) .." ".. Language[10353] Util.SetGray(go, data.openState == 0) Util.AddOnceClick(go, function() if data.openState == 1 then