Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
zhangqiang 2020-09-04 18:35:40 +08:00
commit 9937727ede
2 changed files with 120 additions and 22 deletions

View File

@ -326,7 +326,7 @@ RectTransform:
- {fileID: 532952345}
- {fileID: 938082707}
- {fileID: 4535518904713677093}
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -408,12 +408,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1050876280358380}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7777446372919136188}
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -557,11 +557,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1099194734490506}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -630,16 +630,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1152419823229942}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 1.8200378, y: 3.0000381}
m_AnchoredPosition: {x: -23.17994, y: -21.999939}
m_SizeDelta: {x: 239.96, y: 30}
m_Pivot: {x: 0, y: 0}
--- !u!222 &222628676164288756
@ -929,12 +929,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1337064799499272}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7777352242113634876}
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1377,11 +1377,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1741692233933420}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -2075,6 +2075,7 @@ GameObject:
- component: {fileID: 224222974628928352}
- component: {fileID: 222333619797484748}
- component: {fileID: 114858779436278692}
- component: {fileID: 243163601042358809}
m_Layer: 5
m_Name: item
m_TagString: Untagged
@ -2093,14 +2094,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9997861, y: 0.9997861, z: 0.9997861}
m_Children:
- {fileID: 224349285503136176}
- {fileID: 224683024331817808}
- {fileID: 405960079000130765}
- {fileID: 8518279625298895111}
- {fileID: 224434720806789634}
- {fileID: 224446402977106412}
- {fileID: 224890648758207378}
- {fileID: 1941970692}
- {fileID: 3706714060613031612}
m_Father: {fileID: 224394906283731470}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2159,6 +2153,61 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &243163601042358809
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1959113108055056}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 0, y: -20, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.3
delay: 0
curveType: 11
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 3706714060613031612}
- initV3: {x: 0, y: 0, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 1.15, y: 1.15, z: 1.15}
changeFloat: 0
duration: 0.3
delay: 0
curveType: 0
changeType: 4
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 3706714060613031612}
- initV3: {x: 1.15, y: 1.15, z: 1.15}
initFloat: 0
isInit: 0
changeV3: {x: 1, y: 1, z: 1}
changeFloat: 0
duration: 0.2
delay: 0
curveType: 0
changeType: 4
sequeueType: 0
loop: 0
loopType: 0
targetObj: {fileID: 3706714060613031612}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &1965393138531970
GameObject:
m_ObjectHideFlags: 0
@ -2378,6 +2427,49 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1178732028978034271
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3706714060613031612}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3706714060613031612
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1178732028978034271}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 224349285503136176}
- {fileID: 224683024331817808}
- {fileID: 405960079000130765}
- {fileID: 8518279625298895111}
- {fileID: 224434720806789634}
- {fileID: 224446402977106412}
- {fileID: 224890648758207378}
- {fileID: 1941970692}
m_Father: {fileID: 224222974628928352}
m_RootOrder: 0
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1842921629120460108
GameObject:
m_ObjectHideFlags: 0
@ -3872,7 +3964,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141}
m_Children: []
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -4269,7 +4361,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141}
m_Children: []
m_Father: {fileID: 224222974628928352}
m_Father: {fileID: 3706714060613031612}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}

View File

@ -235,6 +235,12 @@ function this.SetRoleList(_roleDatas)
this.ScrollView:SetData(_roleDatas, function(index, go)
this.SingleHeroDataShow(go, _roleDatas[index])
end)
this.ScrollView:ForeachItemGO(function(index, go)
Timer.New(function()
go.gameObject:SetActive(true)
PlayUIAnim(go.gameObject)
end, 0.01 * (index - 1)):Start()
end)
end
--设置单个英雄数据
function this.SingleHeroDataShow(_go, _heroData)