Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-03-18 10:07:08 +08:00
commit 778ed8e886
4 changed files with 8 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 42 KiB

View File

@ -35834,8 +35834,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: -1.9999971, y: -0.0000032484531}
m_SizeDelta: {x: 200, y: 60}
m_AnchoredPosition: {x: 0.96000004, y: -0.0000032484531}
m_SizeDelta: {x: 222.08, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6846372967051224326
CanvasRenderer:
@ -35878,7 +35878,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 0.7
m_Text: "\u7D2F\u5145\u6EE11\u5143"
m_Text: "\u7D2F\u5145\u6EE16\u5143"
LanguageIndex: 0
--- !u!1 &4075015836899280644
GameObject:
@ -38299,8 +38299,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: -2.0000112, y: -0.0000032484531}
m_SizeDelta: {x: 200, y: 60}
m_AnchoredPosition: {x: 1.35, y: -0.0000032484531}
m_SizeDelta: {x: 221.3, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7755346295663995697
CanvasRenderer:
@ -38343,7 +38343,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 0.7
m_Text: "\u7D2F\u5145\u503C15\u5143"
m_Text: "\u7D2F\u5145\u503C100\u5143"
LanguageIndex: 0
--- !u!1001 &6359050367270521292
PrefabInstance:

View File

@ -13681,7 +13681,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: d44413cd520156b4f874b77dd529bf22, type: 3}
m_Sprite: {fileID: 21300000, guid: f62be2bcbda7be34890c96bcd9f9797d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -657,6 +657,7 @@ function this.CreatActivity()
if not activityTabs[k] then
activityTabs[k] = {}
activityTabs[k].go = newObjToParent(this.activityTabPrefab,this.RightUp)
activityTabs[k].go.gameObject.name = "tab"..v.Id
activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image")
activityTabs[k].timeImg = Util.GetGameObject(activityTabs[k].go, "Image_1")
activityTabs[k].timeText = Util.GetGameObject(activityTabs[k].timeImg, "time"):GetComponent("Text")