日常任务修改

jiaoyangna 2020-09-10 15:36:17 +08:00
parent 49f0c19cea
commit f2015e8c98
6 changed files with 399 additions and 109 deletions

View File

@ -41,7 +41,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 563.0499, y: -45.050003}
m_AnchoredPosition: {x: 563.0499, y: -45.05}
m_SizeDelta: {x: 88.1, y: 90.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222229770521615770
@ -612,7 +612,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 328.24997, y: -45.050003}
m_AnchoredPosition: {x: 328.24997, y: -45.05}
m_SizeDelta: {x: 88.1, y: 90.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222847014652085586
@ -1285,7 +1285,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 93.44995, y: -45.050003}
m_AnchoredPosition: {x: 93.44998, y: -45.05}
m_SizeDelta: {x: 88.1, y: 90.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222917638141494732
@ -2236,12 +2236,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2143589712445288076}
m_Father: {fileID: 6506801113587302739}
m_RootOrder: 6
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: 259.6, y: -66}
m_AnchoredPosition: {x: 259.60007, y: -66}
m_SizeDelta: {x: 73.9, y: 42.04}
m_Pivot: {x: 0.36038244, y: 0.5}
--- !u!222 &5221557223127298546
@ -2540,12 +2540,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8192470711337515734}
m_Father: {fileID: 2143589712445288076}
m_Father: {fileID: 6506801113587302739}
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: 685.4, y: -112.2999}
m_AnchoredPosition: {x: 685.4001, y: -112.2999}
m_SizeDelta: {x: 210.65, y: 77.61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5544556297160053313
@ -2675,7 +2675,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7081655482757342369}
m_Father: {fileID: 993731393297786437}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@ -3085,12 +3085,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8995802738978682241}
m_Father: {fileID: 8916335988161755956}
m_Father: {fileID: 8346032574987793366}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -135.70001, y: -0.29989624}
m_AnchoredPosition: {x: -135.69995, y: -0.29992676}
m_SizeDelta: {x: 210.65002, y: 77.61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6356434684782085281
@ -3191,6 +3191,46 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1454276763713780010
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 993731393297786437}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &993731393297786437
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1454276763713780010}
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: 4238141339658570511}
- {fileID: 1583377035289623720}
- {fileID: 1377542536350534115}
- {fileID: 7235002840401175143}
- {fileID: 5927569354025994995}
m_Father: {fileID: 7081655482757342369}
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: 836.4, y: 142.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1455432226636305903
GameObject:
m_ObjectHideFlags: 0
@ -3259,12 +3299,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2143589712445288076}
m_Father: {fileID: 6506801113587302739}
m_RootOrder: 5
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: 268.3, y: -1.7999873}
m_AnchoredPosition: {x: 268.30005, y: -1.7999873}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7399863649284779451
@ -3684,7 +3724,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7081655482757342369}
m_Father: {fileID: 993731393297786437}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@ -3966,6 +4006,7 @@ GameObject:
m_Component:
- component: {fileID: 1918779212295282661}
- component: {fileID: 1918779212295282660}
- component: {fileID: 977369845179561181}
m_Layer: 5
m_Name: itemPro
m_TagString: Untagged
@ -3984,18 +4025,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1918779213160555210}
- {fileID: 927593973145893372}
- {fileID: 1918779213822170912}
- {fileID: 468007378357944310}
- {fileID: 3161722440037881863}
- {fileID: 1918779213491360749}
- {fileID: 4432934858545881586}
m_Father: {fileID: 1918779212796953291}
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: -931.80005, y: -87}
m_AnchoredPosition: {x: -1370, y: -80}
m_SizeDelta: {x: 846, y: 127.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1918779212295282660
@ -4006,6 +4042,35 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1918779212295282658}
m_CullTransparentMesh: 0
--- !u!114 &977369845179561181
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1918779212295282658}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 230, y: -20, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.15
delay: 0
curveType: 11
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 4432934858545881586}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &1918779212406558120
GameObject:
m_ObjectHideFlags: 0
@ -4663,12 +4728,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1918779212295282661}
m_Father: {fileID: 4432934858545881586}
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: 157, y: -64.95}
m_AnchoredPosition: {x: 1511.8, y: -41.89995}
m_SizeDelta: {x: 8, y: 110}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1918779213160555212
@ -4740,12 +4805,12 @@ RectTransform:
m_Children:
- {fileID: 2674429168067554592}
- {fileID: 6964371350467663445}
m_Father: {fileID: 1918779212295282661}
m_Father: {fileID: 4432934858545881586}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 734.2, y: -64.94995}
m_AnchoredPosition: {x: 732.8, y: -63.95}
m_SizeDelta: {x: 190, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1918779213491360721
@ -4984,12 +5049,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1918779212295282661}
m_Father: {fileID: 4432934858545881586}
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: 78, y: -64.94995}
m_AnchoredPosition: {x: 84.69, y: -62.45}
m_SizeDelta: {x: 156, y: 125.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1918779213822170914
@ -5289,16 +5354,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2639502772477440026}
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: 1918779212295282661}
m_Father: {fileID: 4432934858545881586}
m_RootOrder: 3
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: -248.69995, y: 41.399933}
m_AnchoredPosition: {x: -234.5, y: 57.05}
m_SizeDelta: {x: 135, y: 100}
m_Pivot: {x: 0, y: 1}
--- !u!114 &462056855713613971
@ -5387,12 +5452,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8916335988161755956}
m_Father: {fileID: 8346032574987793366}
m_RootOrder: 2
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: -77, y: -30.345}
m_AnchoredPosition: {x: -77, y: -30.34497}
m_SizeDelta: {x: 565.5, y: 137.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1917475996570622930
@ -5788,12 +5853,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2256917480139661916}
m_Father: {fileID: 8916335988161755956}
m_Father: {fileID: 8346032574987793366}
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: 15.700012, y: -45.600067}
m_AnchoredPosition: {x: 15.699707, y: -45.600098}
m_SizeDelta: {x: 558, y: 44}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4545410394449060312
@ -6182,7 +6247,7 @@ RectTransform:
m_Children:
- {fileID: 4749439105399814342}
- {fileID: 4427517356705230493}
m_Father: {fileID: 7081655482757342369}
m_Father: {fileID: 993731393297786437}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@ -6545,12 +6610,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2143589712445288076}
m_Father: {fileID: 6506801113587302739}
m_RootOrder: 2
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: -67.5, y: -31.399994}
m_AnchoredPosition: {x: -67.49997, y: -31.399994}
m_SizeDelta: {x: 565.5, y: 137.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4262336696161190878
@ -6619,7 +6684,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8916335988161755956}
m_Father: {fileID: 8346032574987793366}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -6702,7 +6767,7 @@ RectTransform:
m_Children:
- {fileID: 3617902804248935102}
- {fileID: 4078091677790062429}
m_Father: {fileID: 2143589712445288076}
m_Father: {fileID: 6506801113587302739}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@ -7383,12 +7448,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8916335988161755956}
m_Father: {fileID: 8346032574987793366}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -135.70001, y: -1.7999873}
m_AnchoredPosition: {x: -135.69995, y: -1.7999878}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4265660881893781513
@ -8012,7 +8077,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7081655482757342369}
m_Father: {fileID: 993731393297786437}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -8137,6 +8202,47 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A3\u59299\u5C0F\u65F6"
LanguageIndex: 11708
--- !u!1 &5630570085107683964
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4432934858545881586}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4432934858545881586
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5630570085107683964}
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: 1918779213160555210}
- {fileID: 927593973145893372}
- {fileID: 1918779213822170912}
- {fileID: 468007378357944310}
- {fileID: 3161722440037881863}
- {fileID: 1918779213491360749}
m_Father: {fileID: 1918779212295282661}
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: 846, y: 127.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5678061619903236431
GameObject:
m_ObjectHideFlags: 0
@ -8166,12 +8272,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2143589712445288076}
m_Father: {fileID: 6506801113587302739}
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: 3.1125, y: 0.000030517578}
m_AnchoredPosition: {x: 3.112561, y: 0.000030517578}
m_SizeDelta: {x: 835.78, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3281865241834822005
@ -8314,7 +8420,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7081655482757342369}
m_Father: {fileID: 993731393297786437}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -8876,12 +8982,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8916335988161755956}
m_Father: {fileID: 8346032574987793366}
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.50097, y: 0.000030517578}
m_AnchoredPosition: {x: -0.50097656, y: 0}
m_SizeDelta: {x: 843, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9083293114866439135
@ -9618,12 +9724,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1918779212295282661}
m_Father: {fileID: 4432934858545881586}
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: 19.806, y: 0.000045776367}
m_AnchoredPosition: {x: 1374.606, y: 23.050095}
m_SizeDelta: {x: 808.714, y: 5}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8002259910232126921
@ -9689,16 +9795,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7256571258521888686}
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: 1918779212295282661}
m_Father: {fileID: 4432934858545881586}
m_RootOrder: 4
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: 28.300049, y: 41.399933}
m_AnchoredPosition: {x: 11.2, y: 57.05}
m_SizeDelta: {x: 135, y: 100}
m_Pivot: {x: 0, y: 1}
--- !u!114 &327137578093138444
@ -9767,6 +9873,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7081655482757342369}
- component: {fileID: 1730709198781680954}
m_Layer: 5
m_Name: rewardPre
m_TagString: Untagged
@ -9785,11 +9892,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4238141339658570511}
- {fileID: 1583377035289623720}
- {fileID: 1377542536350534115}
- {fileID: 7235002840401175143}
- {fileID: 5927569354025994995}
- {fileID: 993731393297786437}
m_Father: {fileID: 956434821998691110}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -9798,6 +9901,35 @@ RectTransform:
m_AnchoredPosition: {x: -1482.8, y: 181}
m_SizeDelta: {x: 836.4, y: 142.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1730709198781680954
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7525919003205098400}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 230, y: -20, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.15
delay: 0
curveType: 11
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 993731393297786437}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &7661479520637418107
GameObject:
m_ObjectHideFlags: 0
@ -9807,13 +9939,14 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8916335988161755956}
- component: {fileID: 8735531852488705892}
m_Layer: 5
m_Name: rewardPre
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8916335988161755956
RectTransform:
m_ObjectHideFlags: 0
@ -9825,21 +9958,44 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5108555561980432324}
- {fileID: 1826624492284208546}
- {fileID: 6116840903932864969}
- {fileID: 5701770522702771699}
- {fileID: 1387418776256987101}
- {fileID: 167398710455642014}
- {fileID: 764550268028986825}
- {fileID: 8346032574987793366}
m_Father: {fileID: 3766131170455723064}
m_RootOrder: 1
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: -1939, y: 502}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 844, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8735531852488705892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7661479520637418107}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 230, y: -20, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.15
delay: 0
curveType: 11
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 8346032574987793366}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &7680065280917945604
GameObject:
m_ObjectHideFlags: 0
@ -10025,7 +10181,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 291.99997, y: -42}
m_SizeDelta: {x: 318.565, y: 39.2}
m_SizeDelta: {x: 325, y: 39.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7701535949295788202
CanvasRenderer:
@ -10171,6 +10327,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7861869261474332378
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8346032574987793366}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8346032574987793366
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7861869261474332378}
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: 5108555561980432324}
- {fileID: 1826624492284208546}
- {fileID: 6116840903932864969}
- {fileID: 5701770522702771699}
- {fileID: 1387418776256987101}
- {fileID: 167398710455642014}
- {fileID: 764550268028986825}
m_Father: {fileID: 8916335988161755956}
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: 844, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7933146419732503759
GameObject:
m_ObjectHideFlags: 0
@ -10180,6 +10378,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2143589712445288076}
- component: {fileID: 46216545580364385}
m_Layer: 5
m_Name: rewardPre
m_TagString: Untagged
@ -10198,13 +10397,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3975253686637887598}
- {fileID: 6817648272337116398}
- {fileID: 553958844504537425}
- {fileID: 143539821124465396}
- {fileID: 2711499078900022554}
- {fileID: 1060898114474175826}
- {fileID: 234640684961686008}
- {fileID: 6506801113587302739}
m_Father: {fileID: 5972105892328137991}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -10213,6 +10406,35 @@ RectTransform:
m_AnchoredPosition: {x: -6.7749977, y: 139}
m_SizeDelta: {x: 829.55, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &46216545580364385
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7933146419732503759}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 230, y: -20, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.15
delay: 0
curveType: 11
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 6506801113587302739}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &8000028089806339627
GameObject:
m_ObjectHideFlags: 0
@ -10359,6 +10581,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8309808952089769363
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6506801113587302739}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6506801113587302739
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8309808952089769363}
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: 3975253686637887598}
- {fileID: 6817648272337116398}
- {fileID: 553958844504537425}
- {fileID: 143539821124465396}
- {fileID: 2711499078900022554}
- {fileID: 1060898114474175826}
- {fileID: 234640684961686008}
m_Father: {fileID: 2143589712445288076}
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: 829.55, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8569537614482094977
GameObject:
m_ObjectHideFlags: 0
@ -11335,12 +11599,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7879523280515069667}
m_Father: {fileID: 2143589712445288076}
m_Father: {fileID: 6506801113587302739}
m_RootOrder: 1
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: -121, y: 66.39993}
m_AnchoredPosition: {x: -120.99997, y: 66.39993}
m_SizeDelta: {x: 558, y: 44}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2879753673189092438
@ -11413,12 +11677,12 @@ RectTransform:
m_Children:
- {fileID: 6811996851877337003}
- {fileID: 5048072846128891372}
m_Father: {fileID: 8916335988161755956}
m_Father: {fileID: 8346032574987793366}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -135.70001, y: -1.0999985}
m_AnchoredPosition: {x: -135.69995, y: -1.0999756}
m_SizeDelta: {x: 210.65002, y: 77.61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2225116492002713069

View File

@ -41,7 +41,7 @@ local activityType = {
},
--叱咤风云 限时召唤
[4303] = {
bg = "Bg3",
bg = "Bg2",
hero = {
[1]={name="Bg2/hero1",id=10006,hero="c_ccfy_kuang02"},
[2]={name="Bg2/hero3",id=10023,hero="c_ccfy_kuang03"},

View File

@ -10,6 +10,7 @@ local itemList = {}
local curAllData = {}
local achievementConfig = ConfigManager.GetConfig(ConfigName.AchievementConfig)
local itemGrid = {}
local isPlayAnim = true
function this:InitComponent(gameObject)
this.rewardPre = Util.GetGameObject(gameObject, "rewardPre")
local v = Util.GetGameObject(gameObject, "rect"):GetComponent("RectTransform").rect
@ -29,6 +30,7 @@ function this:RemoveListener()
end
function this:OnShow(_parent,...)
isPlayAnim = true
parent=_parent
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
@ -55,11 +57,20 @@ function this.OnShowPanelData()
this.ScrollView:SetData(AllData, function (index, go)
this.SingleDataShow(go, AllData[index])
end)
if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false
end
end
function this.SingleDataShow(go,rewardData)
local activityRewardGo = go
activityRewardGo:SetActive(true)
if isPlayAnim then
activityRewardGo:SetActive(false)
else
activityRewardGo:SetActive(true)
end
local sConFigData = achievementConfig[rewardData.missionId]
local titleText = Util.GetGameObject(activityRewardGo, "titleImage/titleText"):GetComponent("Text")
titleText.text = sConFigData.ContentsShow

View File

@ -23,6 +23,7 @@ local allMissionDailyPres = {}
local allMissionDailyItemPres = {}
local allMissionDailyBoxItemPres = {}
local myGo
local isPlayAnim = true
function this:InitComponent(gameObject)
myGo = gameObject
this.rectMask=Util.GetGameObject(gameObject,"rect"):GetComponent("Image")
@ -69,6 +70,7 @@ function this:RemoveListener()
end
function this:OnShow(_parent,...)
isPlayAnim = true
parent=_parent
sortingOrder = _parent.sortingOrder
--不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参
@ -94,13 +96,13 @@ function this.OnShowData()
dailyTasksConfig=ConfigManager.GetConfig(ConfigName.DailyTasksConfig)
curDailyMissionData = {}
curDailyMissionBoxData = {}
for i, v in pairs(TaskManager.GetTypeTaskList(TaskTypeDef.DayTask)) do
for i, v in pairs(TaskManager.GetTypeTaskList(TaskTypeDef.DayTask)) do
if v.missionId < 10000 then
if dailyTasksConfig[v.missionId].OpenLevel or ActTimeCtrlManager.SingleFuncState(dailyTasksConfig[v.missionId].OpenLevel) then
if dailyTasksConfig[v.missionId].OpenLevel then
table.insert(curDailyMissionData,v)
end
else
if dailyTasksConfig[v.missionId].OpenLevel or ActTimeCtrlManager.SingleFuncState(dailyTasksConfig[v.missionId].OpenLevel) then
if dailyTasksConfig[v.missionId].OpenLevel then
table.insert(curDailyMissionBoxData,v)
end
end
@ -115,8 +117,13 @@ function this.OnShowData()
local AllData = TaskManager.GetTypeTaskList(TaskTypeDef.Achievement)
this.ScrollView:SetData(curDailyMissionData, function (index, go)
this.SingleMissionDatasDataShow(go,curDailyMissionData[index])
end)
end)
this.SetDailyMissionBox(curDailyMissionBoxData)
if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false
end
end
function this.SingleMissionDatasDataShow(_go,_missionData)
@ -133,7 +140,11 @@ function this.SingleMissionDatasDataShow(_go,_missionData)
table.insert(reward,{reward = {missionConfigData.MazePoint[i][1],missionConfigData.MazePoint[i][2]},type = 2})
end
end
_go:SetActive(true)
if isPlayAnim then
_go:SetActive(false)
else
_go:SetActive(true)
end
local titleText = Util.GetGameObject(_go, "titleImage/titleText"):GetComponent("Text")
titleText.text =string.format(missionConfigData.Desc,missionConfigData.Values[2][1])
local itemGroup = Util.GetGameObject(_go, "content")
@ -146,7 +157,6 @@ function this.SingleMissionDatasDataShow(_go,_missionData)
this.NoviceItemList[_go][i] = SubUIManager.Open(SubUIConfig.ItemView, itemGroup.transform)
end
this.NoviceItemList[_go][i].gameObject:SetActive(false)
end
local show
for i = 1, #reward do
@ -207,12 +217,13 @@ function this.SetDailyMissionBox(_missionDatas)
local curGetRewardNum=0
for i, v in pairs(curDailyMissionBoxData) do
for i, v in ipairs(curDailyMissionBoxData) do
--LogGreen("v.missionId "..v.missionId.." "..v.progress)
if v.progress > curGetRewardNum then
curGetRewardNum = v.progress
end
end
--LogGreen("#_missionDatas:"..#_missionDatas)
this.progressBottom.fillAmount=curGetRewardNum/dailyTasksConfig[_missionDatas[#_missionDatas].missionId].Values[2][1]
this.totalPro.text= Language[11361]..curGetRewardNum--.."/"..LengthOfTable(curDailyMissionData)
for i, v in pairs(_missionDatas) do

View File

@ -8,6 +8,7 @@ local sortingOrder=0
local curScore = 0--当前分数
local treasureState = 0
local itemsList={}
local isPlayAnim = true
function this:InitComponent(gameObject)
--topBar/btnBack
this.gameObject = gameObject
@ -59,17 +60,18 @@ end
function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess, this.refresh)
Game.GlobalEvent:AddEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh)
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.CloseFunction)
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose,this.Closefunction)
Game.GlobalEvent:AddEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh)
end
function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.BuyQinglongSerectLevelSuccess, this.refresh)
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh)
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose,this.CloseFunction)
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose,this.Closefunction)
Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh)
end
this.Closefunction = function()
isPlayAnim = true
Timer.New(function()
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
PopupTipPanel.ShowTip(Language[12320])
@ -81,6 +83,7 @@ this.Closefunction = function()
end,1):Start()
end
function this:OnShow(_parent,...)
isPlayAnim = true
parent=_parent
sortingOrder = _parent.sortingOrder
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
@ -189,30 +192,20 @@ function this:showTaskList()
this.ScrollView:SetData(rewardData,function(index, rewardItem)
this:SingleTask(rewardItem, rewardData[index])
end)
-- --定位打开界面时位置
-- local t = 0
-- if treasureState == 0 then
-- for i = 1, #rewardStateData do
-- if rewardStateData[i].state == 0 then
-- t = i
-- break
-- end
-- end
-- elseif treasureState == 1 then
-- for i = 1, #rewardStateData do
-- if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then
-- t = i
-- breakPopupTipPanel
-- end
-- end
-- end
--this.ScrollView:SetIndex(t-2)
if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false
end
end
--单个任务
function this:SingleTask(rewardItem, rewardSingleData)
if isPlayAnim then
rewardItem:SetActive(false)
else
rewardItem:SetActive(true)
end
local scoreLevel = Util.GetGameObject(rewardItem, "scoreLevel"):GetComponent("Text")
local box1 = Util.GetGameObject(rewardItem, "box1")
local box2 = Util.GetGameObject(rewardItem, "box2")
@ -237,7 +230,7 @@ function this:SingleTask(rewardItem, rewardSingleData)
else
itemsList[rewardItem][i].gameObject.transform:SetParent(box2.transform)
end
itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero
itemsList[rewardItem][i].gameObject:SetActive(true)
itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8, false)
else

View File

@ -6,6 +6,7 @@ local parent
local sortingOrder=0
local curType = 1
local treasureState
local isPlayAnim = true
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
function this:InitComponent(gameObject)
this.gameObject = gameObject
@ -98,6 +99,7 @@ this.Closefunction = function()
end
function this:OnShow(_parent,...)
isPlayAnim = true
parent=_parent
sortingOrder = _parent.sortingOrder
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
@ -190,6 +192,11 @@ function this:showTaskList(type)
this.ScrollView:SetData(rewardData,function(index, rewardItem)
this:SingleTask(rewardItem, rewardData[index])
end)
if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false
end
end
local type={
[0]={sprite = "s_slbz_1anniuhuangse",text = Language[10023]},
@ -199,7 +206,11 @@ local type={
--单个任务
function this:SingleTask(go, rewardSingleData)
local activityRewardGo = go
activityRewardGo:SetActive(true)
if isPlayAnim then
activityRewardGo:SetActive(false)
else
activityRewardGo:SetActive(true)
end
local sConFigData = rewardSingleData
local strs = string.split(sConFigData.show)
local titleText = Util.GetGameObject(activityRewardGo, "content"):GetComponent("Text")