Merge branch 'tcx_xiyou_dev' into tcx_xiyou_solider

tcx_xiyou_solider
PC-202302260912\Administrator 2024-04-22 17:50:01 +08:00
commit cee117927f
4 changed files with 7 additions and 7 deletions

View File

@ -1967,7 +1967,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.93333334, b: 0.8392157, a: 0.8156863}
m_Color: {r: 0.1981132, g: 0.17060255, b: 0.13176396, a: 0.8156863}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -860,7 +860,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 0.5943396, g: 0.34690168, b: 0.11494303, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -889,7 +889,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2666094069143754055}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -931,7 +931,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: -73.2, y: -24.5}
m_AnchoredPosition: {x: 16, y: -24.5}
m_SizeDelta: {x: 1210.4, y: 331.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5179290475118330717
@ -962,7 +962,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: bd1c85ff08244c147a908fde57ce42ef, type: 3}
m_Sprite: {fileID: 21300000, guid: ce350c69add5fc348a8dc440e4771f36, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -2796,7 +2796,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.7058824, g: 0.4862745, b: 0.11372549, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -605,7 +605,7 @@ function this.ShowGuide(id)
if GuideConfig[id].Desc then
local str = GetLanguageStrById(GuideConfig[id].Desc)
str = string.gsub(str, "{", "<color=#FFEDA1FF>")
str = string.gsub(str, "{", "<color=#2E5522>")
str = string.gsub(str, "}", "</color>")
this.desc.text = str
end