Merge branch 'tcx_xiyou_bt_dev' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_bt_dev
commit
3c3eeab67d
|
@ -12620,7 +12620,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.98823535, g: 0.7843138, b: 0.38823533, a: 1}
|
||||
m_Color: {r: 0.44705883, g: 0.3019608, b: 0.02745098, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
|
@ -294,7 +294,7 @@ function WeekCardPanel:ShowCardInfo(index,config)
|
|||
end )
|
||||
pre.Text.text = name.."*"..PrintWanNum2(oneNum)
|
||||
local str=name.."*"..PrintWanNum2(allNum)
|
||||
pre.hint.text = "共计: ".."<color=#ffe79a>"..str.."</color>"
|
||||
pre.hint.text = "共计: ".."<color=#D46000>"..str.."</color>"
|
||||
local rechargeCfg = _RechargeCommodityConfig[config.RechargeId]
|
||||
if not rechargeCfg then
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue