Merge branch 'tcx_xiyou_dev' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_dev
commit
55820abdb2
|
@ -33439,7 +33439,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: -264, y: -28}
|
||||
m_AnchoredPosition: {x: -232, y: -28}
|
||||
m_SizeDelta: {x: 436.4, y: 35.72}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!222 &1751375301564421718
|
||||
|
@ -34234,8 +34234,8 @@ 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: d8e19ffb0a1c14b4dba326a273e52e7a, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: dcab34f84847d94448b245ab7e62e44e, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
@ -104063,7 +104063,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: -157, y: 20}
|
||||
m_AnchoredPosition: {x: -125, y: 20}
|
||||
m_SizeDelta: {x: 212.7, y: 40.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6034633423508481120
|
||||
|
@ -120686,7 +120686,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: -337.30002, y: -25}
|
||||
m_AnchoredPosition: {x: -305.30002, y: -25}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &3598280338070115234
|
||||
|
@ -209533,6 +209533,7 @@ GameObject:
|
|||
- component: {fileID: 1401481456526575816}
|
||||
- component: {fileID: 6113941212156158217}
|
||||
- component: {fileID: 4303150261745223147}
|
||||
- component: {fileID: 2951781008968434982}
|
||||
m_Layer: 0
|
||||
m_Name: btnName
|
||||
m_TagString: Untagged
|
||||
|
@ -209580,7 +209581,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.99215686, g: 0.9372549, b: 0.8, a: 1}
|
||||
m_Color: {r: 0.8301887, g: 0.60667026, b: 0.105731584, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -209602,6 +209603,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u7D2B\u5E9C\u795E\u5370"
|
||||
LanguageIndex: 0
|
||||
--- !u!114 &2951781008968434982
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7107847740852495298}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -1}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &7150056147427133616
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -227265,7 +227281,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: -158.1, y: -77.8}
|
||||
m_AnchoredPosition: {x: -126.100006, y: -77.8}
|
||||
m_SizeDelta: {x: 212.7, y: 40.9}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6590152961140789152
|
||||
|
|
|
@ -616,10 +616,10 @@ function this.ShowInfos(teamInfo)
|
|||
local img = value:GetComponent("Image")
|
||||
local text = Util.GetGameObject(value,"btnName"):GetComponent("Text")
|
||||
if this.infoIndex == index then
|
||||
img.sprite = this.spLoader:LoadSprite("s_shop_qieye_2")
|
||||
img.sprite = this.spLoader:LoadSprite("r_hero_xuanze_001")
|
||||
text.color = Color.New(253 / 255, 244 / 255, 214 / 255, 1)
|
||||
else
|
||||
img.sprite = this.spLoader:LoadSprite("s_shop_qieye_1")
|
||||
img.sprite = this.spLoader:LoadSprite("r_hero_xuanze_002")
|
||||
text.color = Color.New(181 / 255, 164 / 255, 129 / 255, 1)
|
||||
end
|
||||
Util.GetGameObject(this.InfoContent,InfoBtns[index].gridName):SetActive(false)
|
||||
|
|
Loading…
Reference in New Issue