Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
6115d676ac
Binary file not shown.
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 4.3 KiB |
|
@ -37,8 +37,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: 421, y: 358}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_AnchoredPosition: {x: 421, y: 366.2}
|
||||
m_SizeDelta: {x: 88, y: 72}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &215893898
|
||||
CanvasRenderer:
|
||||
|
@ -31120,8 +31120,8 @@ 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: 85.1, y: 18.9}
|
||||
m_SizeDelta: {x: 26, y: 26}
|
||||
m_AnchoredPosition: {x: 104, y: 18.9}
|
||||
m_SizeDelta: {x: 54, y: 54}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2686890129391534151
|
||||
CanvasRenderer:
|
||||
|
@ -53711,7 +53711,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.0000048876, y: 0.0000048876}
|
||||
m_SizeDelta: {x: 54.9, y: 54.9}
|
||||
m_SizeDelta: {x: 88, y: 72}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &605943121813092261
|
||||
CanvasRenderer:
|
||||
|
@ -53741,7 +53741,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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -146,7 +146,7 @@ function this:SetIcon()
|
|||
end
|
||||
elseif (waveId == data.monsterWave + 1) then
|
||||
this.tip.text = "战斗奖励"
|
||||
this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("Btn_hz_cheng_01")
|
||||
this.sureBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("X1_zhanling_pata_bt_03")
|
||||
this.fightBtnText.text = string.format("<color=#%s>%s</color>","17232A","挑 战")
|
||||
else
|
||||
this.tip.text = "战斗奖励"
|
||||
|
|
|
@ -509,7 +509,7 @@ function this:ShopItemAdapter(shopItem, itemData)
|
|||
local haveCount = BagManager.GetTotalItemNum(con.Id)
|
||||
itemName.text = itemName.text ..
|
||||
"\n" ..
|
||||
string.format("<color=%s><size=%s>%s(%s/%s)</size></color>", UIColorStr.BLACK, "25", "拥有:", haveCount,
|
||||
string.format("<color=%s><size=%s>%s(%s/%s)</size></color>", "#FAE05C", "25", "拥有:", haveCount,
|
||||
con.UsePerCount)
|
||||
end
|
||||
if con.ItemType == ItemType.Talisman then
|
||||
|
|
Loading…
Reference in New Issue