diff --git a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab index 45de651ef2..3e4af6ae5e 100644 --- a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab @@ -1536,7 +1536,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2650,7 +2650,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -7782,7 +7782,7 @@ ParticleSystem: --- !u!199 &7209200664494720904 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9320,7 +9320,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -10101,7 +10101,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -10181,7 +10181,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 + m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index bd4a76b0ed..c7e4a2ce22 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -192,7 +192,7 @@ function NiuQiChongTianPanel:SetProgress() self.progress.fillAmount = self.curScore/self.progressData[#self.progressData].value[2][1] for i = 1, self.reward.transform.childCount do local item = self.reward.transform:GetChild(i-1) - Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = self.progressData[i].reward[1][2] + Util.GetGameObject(item, "num/Text"):GetComponent("Text").text = PrintWanNum2(self.progressData[i].reward[1][2]) Util.GetGameObject(item, "Text"):GetComponent("Text").text = self.progressData[i].value[2][1] Util.GetGameObject(item, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(artConfig[itemConfig[self.progressData[i].reward[1][1]].ResourceID].Name) Util.GetGameObject(item, "red"):SetActive(self.progressData[i].state == 1)