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

dev_chengFeng
zhangqiang 2020-09-04 17:51:05 +08:00
commit cbad6e10cd
4 changed files with 119 additions and 18 deletions

View File

@ -607,11 +607,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 151329815370130567}
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: 3927445822717856015}
m_Father: {fileID: 7417685538386170377}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -950,6 +950,7 @@ GameObject:
m_Component:
- component: {fileID: 3927445822717856015}
- component: {fileID: 7118053265958384628}
- component: {fileID: 5919224080960154726}
m_Layer: 5
m_Name: itemPre
m_TagString: Untagged
@ -968,11 +969,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3269135121239009431}
- {fileID: 3022850141970967806}
- {fileID: 7038847592521067331}
- {fileID: 8694404247752698229}
- {fileID: 5062996887476603151}
- {fileID: 7417685538386170377}
m_Father: {fileID: 3763222351746409926}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -989,6 +986,61 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 393739227522380127}
m_CullTransparentMesh: 0
--- !u!114 &5919224080960154726
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 393739227522380127}
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: 7417685538386170377}
- 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: 7417685538386170377}
- 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: 7417685538386170377}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &460744687276555269
GameObject:
m_ObjectHideFlags: 0
@ -1167,11 +1219,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705317673376917561}
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: 3927445822717856015}
m_Father: {fileID: 7417685538386170377}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1631,11 +1683,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2207139953333080062}
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: 3927445822717856015}
m_Father: {fileID: 7417685538386170377}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1942,6 +1994,46 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3285807168851116554
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7417685538386170377}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7417685538386170377
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3285807168851116554}
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: 3269135121239009431}
- {fileID: 3022850141970967806}
- {fileID: 7038847592521067331}
- {fileID: 8694404247752698229}
- {fileID: 5062996887476603151}
m_Father: {fileID: 3927445822717856015}
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 &4714015566873191630
GameObject:
m_ObjectHideFlags: 0
@ -1976,7 +2068,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.000014760596, y: -0.00006866455}
m_AnchoredPosition: {x: 0, y: -0.00006866455}
m_SizeDelta: {x: 0, y: -0.000091553}
m_Pivot: {x: 0.00000010803342, y: 0.9999999}
--- !u!114 &2285424144751814410
@ -2232,12 +2324,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5250587001998588755}
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: 8916421909378411696}
m_Father: {fileID: 3927445822717856015}
m_Father: {fileID: 7417685538386170377}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -2465,11 +2557,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5607663567783973525}
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: 3927445822717856015}
m_Father: {fileID: 7417685538386170377}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}

View File

@ -193,7 +193,12 @@ function this.SetStaticData()
item[#item + 1] = itemId
item[#item + 1] = 0
this.rewardList[i]:OnOpen(false, item, 1.05)
this.rewardList[i].gameObject:SetActive(true)
-- this.rewardList[i].gameObject:SetActive(true)
Timer.New(function()
this.rewardList[i].gameObject:SetActive(true)
PlayUIAnim(this.rewardList[i].gameObject)
end, 0.001 * (i - 1)):Start()
end
-- 显示怪物
@ -206,7 +211,11 @@ function this.SetStaticData()
icon.sprite = mIcon
monsterLevel.text = level
this.bossList[j]:SetActive(true)
-- this.bossList[j]:SetActive(true)
Timer.New(function()
this.bossList[j]:SetActive(true)
PlayUIAnim(this.bossList[j])
end, 0.001 * (j - 1)):Start()
end