Merge branch 'tcx_xiyou_dev' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_dev

PC-202302260912\Administrator 2024-04-17 19:30:56 +08:00
commit 20748289a5
2 changed files with 2 additions and 2 deletions

View File

@ -66560,7 +66560,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.11764707, g: 0.6039216, b: 0.26666668, a: 1}
m_Color: {r: 0, g: 0.8039216, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -73,7 +73,7 @@ function FetterItem:SetData(data,_parent,_index)
if self.itemData.enabled < 1 then
self.tipText.text = string.format("<color=#ffd674>%s</color>",self.itemData.activeParaTip)
elseif self.itemData.enabled then
self.tipText.text = string.format("<color=#1CC853>%s</color>",self.itemData.activeParaTip)
self.tipText.text = string.format("<color=#2E5522>%s</color>",self.itemData.activeParaTip)
end
-- self.tipText.text = self.itemData.activeParaTip