限时提交

dev_chengFeng
jiaoyangna 2020-07-08 19:16:04 +08:00
parent 5e00986d05
commit 21778b4a74
3 changed files with 219 additions and 206 deletions

View File

@ -1733,7 +1733,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224022179357799424
RectTransform:
m_ObjectHideFlags: 0
@ -2605,10 +2605,10 @@ RectTransform:
m_Father: {fileID: 865909649873836560}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 179.5, y: -37.5}
m_SizeDelta: {x: 75, y: 53}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3385190789731403730
CanvasRenderer:
@ -3525,10 +3525,10 @@ RectTransform:
m_Father: {fileID: 8645294579701598529}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -82.15}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &848985538316811060
CanvasRenderer:
@ -4020,10 +4020,10 @@ RectTransform:
m_Father: {fileID: 3908445306704867997}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -104.7}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6105261017678981020
CanvasRenderer:
@ -4185,10 +4185,10 @@ RectTransform:
m_Father: {fileID: 256931815944643907}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -14.5}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1271570584172040396
CanvasRenderer:
@ -6785,10 +6785,10 @@ RectTransform:
m_Father: {fileID: 256931815944643907}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -82.15}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5771984718345980949
CanvasRenderer:
@ -11466,7 +11466,7 @@ ParticleSystem:
--- !u!199 &4026277983322118074
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -13002,7 +13002,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -83.02002}
m_SizeDelta: {x: 29, y: 119.2}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &3351238965715829192
MonoBehaviour:
@ -13248,10 +13248,10 @@ RectTransform:
m_Father: {fileID: 256931815944643907}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -37.05}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6606966826223360989
CanvasRenderer:
@ -13815,10 +13815,10 @@ RectTransform:
m_Father: {fileID: 3908445306704867997}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -37.05}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2747640047943409104
CanvasRenderer:
@ -15055,10 +15055,10 @@ RectTransform:
m_Father: {fileID: 8645294579701598529}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -59.6}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4038596017855710722
CanvasRenderer:
@ -15211,7 +15211,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -108.880005}
m_SizeDelta: {x: 29, y: 119.2}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2528069000549957389
MonoBehaviour:
@ -15778,9 +15778,9 @@ RectTransform:
m_Father: {fileID: 2563449696537189548}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75, y: -83.9}
m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6956935737205087937
@ -17539,10 +17539,10 @@ RectTransform:
m_Father: {fileID: 9169938052652378160}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 46, y: -37.5}
m_SizeDelta: {x: 92, y: 53}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7576367435209257744
CanvasRenderer:
@ -22709,7 +22709,7 @@ ParticleSystem:
--- !u!199 &1335144838161731503
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -23113,10 +23113,10 @@ RectTransform:
m_Father: {fileID: 8645294579701598529}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -37.05}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4111272115308872923
CanvasRenderer:
@ -29770,7 +29770,7 @@ ParticleSystem:
--- !u!199 &3478638013891207890
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -30472,10 +30472,10 @@ RectTransform:
m_Father: {fileID: 8645294579701598529}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -14.5}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3240991912704273796
CanvasRenderer:
@ -31214,7 +31214,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -12.96, y: 5.91}
m_SizeDelta: {x: 217, y: 75}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4340293503976776403
MonoBehaviour:
@ -36743,7 +36743,7 @@ ParticleSystem:
--- !u!199 &7935500073970882351
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41641,7 +41641,7 @@ ParticleSystem:
--- !u!199 &8340592425251791152
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -42776,10 +42776,10 @@ RectTransform:
m_Father: {fileID: 3908445306704867997}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -59.6}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7039602054935919188
CanvasRenderer:
@ -43233,7 +43233,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -43377,10 +43377,10 @@ RectTransform:
m_Father: {fileID: 771717322046565802}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.25}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: -38.7, y: -76.910034}
m_SizeDelta: {x: -283, y: -937.9}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 501.3, y: -76.910034}
m_SizeDelta: {x: 797, y: 22.099976}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1531783935696122457
CanvasRenderer:
@ -43947,10 +43947,10 @@ RectTransform:
m_Father: {fileID: 865909649873836560}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 33.5, y: -37.5}
m_SizeDelta: {x: 67, y: 53}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7103487418462813873
CanvasRenderer:
@ -44107,10 +44107,10 @@ RectTransform:
m_Father: {fileID: 865909649873836560}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 104.5, y: -37.5}
m_SizeDelta: {x: 75, y: 75}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7809564018559934362
CanvasRenderer:
@ -45017,7 +45017,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4861732001835339994
RectTransform:
m_ObjectHideFlags: 0
@ -45239,9 +45239,9 @@ RectTransform:
m_Father: {fileID: 187152867808059859}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -25}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6862162761333370600
@ -45732,10 +45732,10 @@ RectTransform:
m_Father: {fileID: 256931815944643907}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -59.6}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8389494249282173091
CanvasRenderer:
@ -52963,7 +52963,7 @@ ParticleSystem:
--- !u!199 &6752594429674840321
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -53435,10 +53435,10 @@ RectTransform:
m_Father: {fileID: 3908445306704867997}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -14.5}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3682801623919796499
CanvasRenderer:
@ -60207,7 +60207,7 @@ ParticleSystem:
--- !u!199 &3319074951465041593
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -65168,7 +65168,7 @@ ParticleSystem:
--- !u!199 &3115939239216534075
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -65645,10 +65645,10 @@ RectTransform:
m_Father: {fileID: 3908445306704867997}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -82.15}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7360715433817600458
CanvasRenderer:
@ -65725,7 +65725,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -9.6, y: 9.39}
m_SizeDelta: {x: 267, y: 75}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2920749518122637498
MonoBehaviour:
@ -66254,9 +66254,9 @@ RectTransform:
m_Father: {fileID: 187152867808059859}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 50, y: -75}
m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7757148817204996626
@ -73045,7 +73045,7 @@ ParticleSystem:
--- !u!199 &1887912736600313456
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -73480,10 +73480,10 @@ RectTransform:
m_Father: {fileID: 256931815944643907}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -104.7}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1599280539285444261
CanvasRenderer:
@ -73794,9 +73794,9 @@ RectTransform:
m_Father: {fileID: 2563449696537189548}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 75, y: -250.20001}
m_SizeDelta: {x: 123, y: 123}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1237614083773060768
@ -74080,10 +74080,10 @@ RectTransform:
m_Father: {fileID: 9169938052652378160}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 129.5, y: -37.5}
m_SizeDelta: {x: 75, y: 75}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &402439565318443126
CanvasRenderer:
@ -74779,7 +74779,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -75665,10 +75665,10 @@ RectTransform:
m_Father: {fileID: 8645294579701598529}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 14.5, y: -104.7}
m_SizeDelta: {x: 29, y: 29}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6271151026396174460
CanvasRenderer:
@ -76782,7 +76782,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -99.77991}
m_SizeDelta: {x: 29, y: 119.2}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &3299539370615829798
MonoBehaviour:
@ -77161,10 +77161,10 @@ RectTransform:
m_Father: {fileID: 9169938052652378160}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 217, y: -37.5}
m_SizeDelta: {x: 100, y: 53}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1893471185777391941
CanvasRenderer:

View File

@ -1,8 +1,9 @@
local RewardPreview= quick_class("RewardPreview")
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
local data={}
local listPre={}
local curtimes=0
local RewardPreview = quick_class("RewardPreview")
local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting)
local data = {}
local listPre = {}
local curtimes = 0
local intervalDatas={}
function RewardPreview:ctor(gameObject)
self.gameObject = gameObject
self:InitComponent(gameObject)
@ -11,114 +12,115 @@ function RewardPreview:ctor(gameObject)
end
function RewardPreview:InitComponent(gameObject)
self.closeBtn=Util.GetGameObject(self.gameObject,"close")
self.itemGrid=Util.GetGameObject(self.gameObject,"itemGrid")
self.itemPre=Util.GetGameObject(self.gameObject,"itemprefab")
self.curtimes=Util.GetGameObject(self.gameObject,"tip1"):GetComponent("Text")
self.slider=Util.GetGameObject(self.gameObject,"Background/Fill"):GetComponent("Image")
self.closeBtn = Util.GetGameObject(self.gameObject, "close")
self.itemGrid = Util.GetGameObject(self.gameObject, "itemGrid")
self.itemPre = Util.GetGameObject(self.gameObject, "itemprefab")
self.curtimes = Util.GetGameObject(self.gameObject, "tip1"):GetComponent("Text")
self.sliderWidth = Util.GetGameObject(self.gameObject, "Background"):GetComponent("RectTransform").sizeDelta.x
self.slider = Util.GetGameObject(self.gameObject, "Background/Fill"):GetComponent("Image")
end
function RewardPreview:BindEvent()
Util.AddClick(self.closeBtn.gameObject,function() self:OnHide() end)
Util.AddClick(
self.closeBtn.gameObject,
function()
self:OnHide()
end
)
end
function RewardPreview:OnShow()
self.gameObject:SetActive(true)
local maxtimesId=lotterySetting[RecruitType.TimeLimitSingle].MaxTimes;
curtimes=PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
self.slider.fillAmount =self: CalculateInterval(curtimes)
self: RefreshRewarid()
self.curtimes.text=Language[12181]..curtimes
self.gameObject:SetActive(true)
local maxtimesId = lotterySetting[RecruitType.TimeLimitSingle].MaxTimes
curtimes = PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)
self:RefreshRewarid()
self.curtimes.text = Language[12181] .. curtimes
self.slider.fillAmount = self:CalculateInterval(curtimes)
end
function RewardPreview:RefreshRewarid()
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
data = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curActivityId)
local tmp=0
local curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
data = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", curActivityId)
local tmp = 0
--间隔的总次数 比如30 60 120 210 300 count=60-30+ 120 - 60+ 210 - 120+ 300 - 210= 300 - 30 =270
local count=0
-- for n,m in ipairs(data) do
-- if n~=1 then
local count = 0
-- for n,m in ipairs(data) do
-- if n~=1 then
-- count = count + m.Values[1][1]-tmp
-- end
-- tmp = m.Values[1][1]
-- --self.slider.fillAmount = curtimes / m.Values[1][1]
-- end
-- tmp = m.Values[1][1]
-- --self.slider.fillAmount = curtimes / m.Values[1][1]
-- end
count = data[#data].Values[1][1]
tmp=0
local position = 0
tmp = 0
local position = 0
local width = self.itemPre.transform:GetComponent("RectTransform").sizeDelta.x
local interval = self.itemGrid.transform:GetComponent("RectTransform").sizeDelta.x - (width * #data)
if(not listPre) then
listPre={}
if (not listPre) then
listPre = {}
end
for n,m in ipairs(data) do
if m then
if not listPre[n] then
listPre[n]=newObjToParent(self.itemPre,self.itemGrid)
local index = 1
for n, m in ipairs(data) do
if m then
if not listPre[n] then
listPre[n] = newObjToParent(self.itemPre, self.itemGrid)
listPre[n].gameObject:SetActive(true)
end
local o= SubUIManager.Open(SubUIConfig.ItemView,listPre[n].transform)
local o = SubUIManager.Open(SubUIConfig.ItemView, listPre[n].transform)
o:OnOpen(false, {m.Reward[1][1], m.Reward[1][2]}, 1.1, true)
o.gameObject:SetActive(true)
Util.GetGameObject(listPre[n].gameObject,"progress"):GetComponent("Text").text=m.Values[1][1]
Util.GetGameObject(listPre[n].gameObject, "progress"):GetComponent("Text").text = m.Values[1][1]
local tempinterval = (m.Values[1][1] - tmp) / count * interval
if n==1 then
position = tempinterval
else
position = tempinterval + width + position
if n == 1 then
position = tempinterval
else
position = tempinterval + width + position
end
listPre[n].transform:GetComponent("RectTransform").anchoredPosition3D=Vector3.New(position,0,0)
tmp=m.Values[1][1]
--LogBlue("position:"..position)
listPre[n].transform:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(position, 0, 0)
--LogBlue(string.format("%.2f", (position + width)/(2*self.sliderWidth)))
intervalDatas[index] =tonumber(string.format("%.2f", (position + width / 2) / self.sliderWidth))
index = index + 1
tmp = m.Values[1][1]
end
end
end
end
function RewardPreview:CalculateInterval(count)
local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
local data= ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curActivityId)
local interval = 0
LogBlue(#data)
for n,m in ipairs(data) do
LogBlue(n.." "..m.Values[1][1])
end
if count>=data[1].Values[1][1] then
interval=0.099
if count>=data[2].Values[1][1] then
interval=0.3
if count>=data[3].Values[1][1] then
interval=0.54
if count>=data[4].Values[1][1] then
interval=0.75
if count>=data[5].Values[1][1] then
interval=1
else
interval = 0.75+ (count - data[4].Values[1][1]) * (1-0.75)/(data[5].Values[1][1]-data[4].Values[1][1])
end
else
interval = 0.54+ (count -data[3].Values[1][1])*(0.75-0.54)/(data[4].Values[1][1]-data[3].Values[1][1])
end
else
interval = 0.3+ (count -data[2].Values[1][1])*(0.54-0.3)/(data[3].Values[1][1]-data[2].Values[1][1])
end
else
interval = 0.099+ (count -data[1].Values[1][1])*(0.3-0.099)/(data[2].Values[1][1]-data[1].Values[1][1])
local width = self.itemPre.transform:GetComponent("RectTransform").sizeDelta.x
if not data or #data < 1 then
local curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)
data = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", curActivityId)
end
else
interval = count*0.001
end
return interval
-- LogBlue(#intervalDatas)
-- for n,m in ipairs(intervalDatas) do
-- LogBlue(m)
-- end
local interval = 0
if count >= data[5].Values[1][1] then
interval = 1
elseif count >= data[4].Values[1][1] then
interval = intervalDatas[4] +(count - data[4].Values[1][1]) * (intervalDatas[5] - intervalDatas[4]) / (data[5].Values[1][1] - data[4].Values[1][1])
elseif count >= data[3].Values[1][1] then
interval = intervalDatas[3] + (count - data[3].Values[1][1]) * (intervalDatas[4] - intervalDatas[3]) / (data[4].Values[1][1] - data[3].Values[1][1])
elseif count >= data[2].Values[1][1] then
interval = intervalDatas[2] + (count - data[2].Values[1][1]) * (intervalDatas[3] - intervalDatas[2]) / (data[3].Values[1][1] - data[2].Values[1][1])
elseif count >= data[1].Values[1][1] then
interval = intervalDatas[1] + (count - data[1].Values[1][1]) * (intervalDatas[2] - intervalDatas[1]) / (data[2].Values[1][1] - data[1].Values[1][1])
else
interval = count * intervalDatas[1] / data[1].Values[1][1]
end
return interval
end
function RewardPreview:OnHide()
self.gameObject:SetActive(false)
data={}
self.gameObject:SetActive(false)
data = {}
end
function RewardPreview:OnDestroy()
listPre=nil
data=nil
listPre = nil
data = nil
end
return RewardPreview
return RewardPreview

View File

@ -150,7 +150,12 @@ function TimeLimitedCall:RefreshNextLevelReward()
break
end
end
--所有任务都已完成
if not rewarditem then
curLvstate = -1
rewarditem = data1[#data1]
curLv=data1[#data1].Id
end
local o= SubUIManager.Open(SubUIConfig.ItemView,self.nextReward.transform)
o:OnOpen(false, {rewarditem.Reward[1][1],rewarditem.Reward[1][2]}, 0.73, false)
o.gameObject:SetActive(true)
@ -171,6 +176,12 @@ function TimeLimitedCall:RefreshNextLevelReward()
end)
end)
self.effect.gameObject:SetActive(true)
elseif (curLvstate==-1) then
self.slider.gameObject:SetActive(false)
self.sliderText.gameObject:SetActive(false)
Util.AddOnceClick(self.getBtn,function()
RewardPreview.new(self.reward)
end)
else
self.slider.gameObject:SetActive(true)
Util.GetGameObject(self.slider.gameObject,"Text"):GetComponent("Text").text=curTimes.."/"..rewarditem.Values[1][1]
@ -187,14 +198,14 @@ function TimeLimitedCall:RefreshNextLevelReward()
end
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(curActivityId)
LogBlue(ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count)
--LogBlue(ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count)
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count - reMaintimes
LogBlue("reMaintimes:"..reMaintimes)
--LogBlue("reMaintimes:"..reMaintimes)
self.recruitTimesUpdate.text = string.format("召唤<color=#F27D0F>%s</color>次必得UP神将",reMaintimes)
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
LogBlue(info.endTime)
LogBlue(info.startTime)
--LogBlue(info.endTime)
--LogBlue(info.startTime)
info = info.endTime - info.startTime
info = self:TimeToDHMS(info)
self.recruitTimeUpdate.text = string.format("活动剩余时间:"..info)
@ -213,9 +224,9 @@ function TimeLimitedCall:TimeToDHMS(second)
end
function TimeLimitedCall:GetMissionStateById(num,activityId)
LogBlue("activityId:"..activityId.. ",num:"..num)
--LogBlue("activityId:"..activityId.. ",num:"..num)
local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
LogBlue(mission.progress.." "..mission.state)
--LogBlue(mission.progress.." "..mission.state)
return mission.progress,mission.state
end