new和complete的效果

This commit is contained in:
yangjing 2022-02-14 18:38:47 +08:00
parent 1c238b492d
commit a1b8386459
7 changed files with 478 additions and 364 deletions

View File

@ -483,7 +483,7 @@ 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: -50, y: 10}
m_AnchoredPosition: {x: -50, y: 15}
m_SizeDelta: {x: 62, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &52328725825174662
@ -4517,7 +4517,8 @@ MonoBehaviour:
mTxtTotal: {fileID: 6887168215974240250}
mImgIcon: {fileID: 52328725825175417}
mGobTips: {fileID: 52328724093684430}
mGobNew: {fileID: 0}
mGobNewTag: {fileID: 0}
mGobCompleteTag: {fileID: 0}
--- !u!95 &6858361773938071793
Animator:
serializedVersion: 3

View File

@ -92,186 +92,6 @@ MonoBehaviour:
- {fileID: 21300000, guid: dcfd40aeb39d14840a3562873a91d161, type: 3}
mFrameRate: 10
mIsPlaying: 1
--- !u!1 &32449617214598456
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 32449617214598457}
- component: {fileID: 32449617214598460}
- component: {fileID: 32449617214598463}
- component: {fileID: 32449617214598462}
m_Layer: 5
m_Name: Gob_New
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &32449617214598457
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32449617214598456}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 6904755265547789116}
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: 60, y: -40}
m_SizeDelta: {x: 91, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!222 &32449617214598460
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32449617214598456}
m_CullTransparentMesh: 0
--- !u!114 &32449617214598463
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32449617214598456}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 96dcae40f043d4249bea93cb53505f92, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &32449617214598462
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32449617214598456}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d0390bd8b8ffd640b34fe25065ff1df, type: 3}
m_Name:
m_EditorClassIdentifier:
updateType: 0
isSpeedBased: 0
hasOnStart: 0
hasOnPlay: 0
hasOnUpdate: 0
hasOnStepComplete: 0
hasOnComplete: 0
hasOnTweenCreated: 0
hasOnRewind: 0
onStart:
m_PersistentCalls:
m_Calls: []
onPlay:
m_PersistentCalls:
m_Calls: []
onUpdate:
m_PersistentCalls:
m_Calls: []
onStepComplete:
m_PersistentCalls:
m_Calls: []
onComplete:
m_PersistentCalls:
m_Calls: []
onTweenCreated:
m_PersistentCalls:
m_Calls: []
onRewind:
m_PersistentCalls:
m_Calls: []
targetIsSelf: 1
targetGO: {fileID: 0}
tweenTargetIsTargetGO: 1
delay: 0
duration: 0.5
easeType: 30
easeCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
loopType: 0
loops: 1
id:
isRelative: 0
isFrom: 0
isIndependentUpdate: 0
autoKill: 1
isActive: 1
isValid: 1
target: {fileID: 32449617214598457}
animationType: 5
targetType: 11
forcedTargetType: 0
autoPlay: 1
useTargetAsV3: 0
endValueFloat: 1
endValueV3: {x: 0, y: 0, z: 0}
endValueV2: {x: 0, y: 0}
endValueColor: {r: 1, g: 1, b: 1, a: 1}
endValueString:
endValueRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
endValueTransform: {fileID: 0}
optionalBool0: 1
optionalFloat0: 0
optionalInt0: 0
optionalRotationMode: 0
optionalScrambleMode: 0
optionalString:
--- !u!1 &32449617334058881
GameObject:
m_ObjectHideFlags: 0
@ -346,7 +166,7 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1893748557942910377
--- !u!1 &936043282440351922
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -354,9 +174,83 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1893748557942910376}
- component: {fileID: 1893748557942910374}
- component: {fileID: 1893748557942910375}
- component: {fileID: 936043282440351923}
- component: {fileID: 936043282440351926}
- component: {fileID: 936043282440351925}
m_Layer: 5
m_Name: Gob_NewTag
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &936043282440351923
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 936043282440351922}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 6904755265547789116}
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: 60, y: -40}
m_SizeDelta: {x: 91, y: 80}
m_Pivot: {x: 1, y: 0}
--- !u!222 &936043282440351926
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 936043282440351922}
m_CullTransparentMesh: 0
--- !u!114 &936043282440351925
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 936043282440351922}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 96dcae40f043d4249bea93cb53505f92, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1642060010220122147
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1642060010220122146}
- component: {fileID: 1642060010220122156}
- component: {fileID: 1642060010220122157}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@ -364,13 +258,13 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1893748557942910376
--- !u!224 &1642060010220122146
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1893748557942910377}
m_GameObject: {fileID: 1642060010220122147}
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}
@ -383,21 +277,21 @@ RectTransform:
m_AnchoredPosition: {x: -8, y: 17}
m_SizeDelta: {x: 37, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1893748557942910374
--- !u!222 &1642060010220122156
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1893748557942910377}
m_GameObject: {fileID: 1642060010220122147}
m_CullTransparentMesh: 0
--- !u!114 &1893748557942910375
--- !u!114 &1642060010220122157
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1893748557942910377}
m_GameObject: {fileID: 1642060010220122147}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@ -996,9 +890,9 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3844714966604585977}
- {fileID: 1893748557942910376}
- {fileID: 1642060010220122146}
m_Father: {fileID: 6904755265547789116}
m_RootOrder: 2
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}
@ -1074,7 +968,7 @@ RectTransform:
- {fileID: 6904755265680529048}
- {fileID: 6904755265327570263}
m_Father: {fileID: 6904755265547789116}
m_RootOrder: 1
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}
@ -1152,7 +1046,7 @@ 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: -50, y: 10}
m_AnchoredPosition: {x: -50, y: 15}
m_SizeDelta: {x: 62, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3844714966604585979
@ -1203,6 +1097,7 @@ GameObject:
- component: {fileID: 3844714966868319705}
- component: {fileID: 3844714966868319707}
- component: {fileID: 3844714966868319704}
- component: {fileID: 4167269203092652203}
m_Layer: 5
m_Name: Gob_Tips
m_TagString: Untagged
@ -1222,12 +1117,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6904755265547789116}
m_RootOrder: 0
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: 20, y: 40}
m_SizeDelta: {x: 175, y: 103}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -100, y: 90}
m_SizeDelta: {x: 176, y: 103}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3844714966868319707
CanvasRenderer:
@ -1266,7 +1161,112 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5777518965787666958
--- !u!114 &4167269203092652203
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3844714966868319526}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d0390bd8b8ffd640b34fe25065ff1df, type: 3}
m_Name:
m_EditorClassIdentifier:
updateType: 0
isSpeedBased: 0
hasOnStart: 0
hasOnPlay: 0
hasOnUpdate: 0
hasOnStepComplete: 0
hasOnComplete: 0
hasOnTweenCreated: 0
hasOnRewind: 0
onStart:
m_PersistentCalls:
m_Calls: []
onPlay:
m_PersistentCalls:
m_Calls: []
onUpdate:
m_PersistentCalls:
m_Calls: []
onStepComplete:
m_PersistentCalls:
m_Calls: []
onComplete:
m_PersistentCalls:
m_Calls: []
onTweenCreated:
m_PersistentCalls:
m_Calls: []
onRewind:
m_PersistentCalls:
m_Calls: []
targetIsSelf: 1
targetGO: {fileID: 0}
tweenTargetIsTargetGO: 1
delay: 0
duration: 0.3
easeType: 7
easeCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
loopType: 1
loops: -1
id:
isRelative: 0
isFrom: 0
isIndependentUpdate: 0
autoKill: 1
isActive: 1
isValid: 1
target: {fileID: 3844714966868319705}
animationType: 2
targetType: 11
forcedTargetType: 0
autoPlay: 1
useTargetAsV3: 0
endValueFloat: 0
endValueV3: {x: -100, y: 100, z: 0}
endValueV2: {x: 0, y: 0}
endValueColor: {r: 1, g: 1, b: 1, a: 1}
endValueString:
endValueRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
endValueTransform: {fileID: 0}
optionalBool0: 0
optionalFloat0: 0
optionalInt0: 0
optionalRotationMode: 0
optionalScrambleMode: 0
optionalString:
--- !u!1 &6675434456423995348
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1274,9 +1274,83 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5777518965787666953}
- component: {fileID: 5777518965787666955}
- component: {fileID: 5777518965787666952}
- component: {fileID: 6675434456423995347}
- component: {fileID: 6675434456423995344}
- component: {fileID: 6675434456423995345}
m_Layer: 5
m_Name: Gob_CompleteTag
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6675434456423995347
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6675434456423995348}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 6904755265547789116}
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: 85, y: -45}
m_SizeDelta: {x: 149, y: 93}
m_Pivot: {x: 1, y: 0}
--- !u!222 &6675434456423995344
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6675434456423995348}
m_CullTransparentMesh: 0
--- !u!114 &6675434456423995345
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6675434456423995348}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b7627b694c6cf4f61aaaa0958bcbfa06, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6675434456645908356
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6675434456645908355}
- component: {fileID: 6675434456645908353}
- component: {fileID: 6675434456645908354}
m_Layer: 5
m_Name: BG
m_TagString: Untagged
@ -1284,13 +1358,13 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5777518965787666953
--- !u!224 &6675434456645908355
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5777518965787666958}
m_GameObject: {fileID: 6675434456645908356}
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}
@ -1303,21 +1377,21 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -400}
m_SizeDelta: {x: 880, y: 800}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5777518965787666955
--- !u!222 &6675434456645908353
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5777518965787666958}
m_GameObject: {fileID: 6675434456645908356}
m_CullTransparentMesh: 0
--- !u!114 &5777518965787666952
--- !u!114 &6675434456645908354
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5777518965787666958}
m_GameObject: {fileID: 6675434456645908356}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@ -1340,7 +1414,7 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5777518965897796755
--- !u!1 &6675434456791679257
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -1348,10 +1422,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5777518965897796754}
- component: {fileID: 5777518965897796764}
- component: {fileID: 5777518965897796765}
- component: {fileID: 5777518965897796767}
- component: {fileID: 6675434456791679256}
- component: {fileID: 6675434456791679254}
- component: {fileID: 6675434456791679255}
- component: {fileID: 6675434456791679253}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
@ -1359,13 +1433,13 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5777518965897796754
--- !u!224 &6675434456791679256
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5777518965897796755}
m_GameObject: {fileID: 6675434456791679257}
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}
@ -1378,21 +1452,21 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 9}
m_SizeDelta: {x: 66, y: 72}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5777518965897796764
--- !u!222 &6675434456791679254
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5777518965897796755}
m_GameObject: {fileID: 6675434456791679257}
m_CullTransparentMesh: 0
--- !u!114 &5777518965897796765
--- !u!114 &6675434456791679255
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5777518965897796755}
m_GameObject: {fileID: 6675434456791679257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@ -1415,13 +1489,13 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5777518965897796767
--- !u!114 &6675434456791679253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5777518965897796755}
m_GameObject: {fileID: 6675434456791679257}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 539362ffcf9bc4a8cb2be32a27fb8d79, type: 3}
@ -1659,10 +1733,11 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3844714966868319705}
- {fileID: 3844714965959359736}
- {fileID: 3844714965755522504}
- {fileID: 32449617214598457}
- {fileID: 3844714966868319705}
- {fileID: 936043282440351923}
- {fileID: 6675434456423995347}
m_Father: {fileID: 6904755266457718618}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1769,7 +1844,8 @@ MonoBehaviour:
mTxtTotal: {fileID: 6904755265327570260}
mImgIcon: {fileID: 3844714966604585976}
mGobTips: {fileID: 3844714966868319526}
mGobNew: {fileID: 32449617214598456}
mGobNewTag: {fileID: 936043282440351922}
mGobCompleteTag: {fileID: 6675434456423995348}
--- !u!95 &7676866810232408424
Animator:
serializedVersion: 3
@ -1983,7 +2059,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5777518965787666953}
- {fileID: 6675434456645908355}
- {fileID: 1969282076287431323}
- {fileID: 1969282076206099682}
- {fileID: 8204993569651742230}
@ -2174,7 +2250,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5777518965897796754}
- {fileID: 6675434456791679256}
m_Father: {fileID: 6904755266457718618}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -300,7 +300,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5111372793132720207}
- {fileID: 1570623986291034939}
- {fileID: 1152711185451593614}
- {fileID: 987875187}
- {fileID: 8767444850111818679}
- {fileID: 8174312654083100069}
@ -532,11 +532,11 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &1570623986291034939 stripped
--- !u!224 &1152711185451593614 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
m_PrefabInstance: {fileID: 5777518965813572997}
m_PrefabInstance: {fileID: 6675434456741144591}
m_PrefabAsset: {fileID: 0}
--- !u!224 &5111372793132720207 stripped
RectTransform:
@ -544,130 +544,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 6286447948450706629}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5777518965813572997
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 981190536}
m_Modifications:
- target: {fileID: 6904755265700125194, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_Name
value: PanelResult
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125194, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ebd5f76171ee4e0b8d96b2eae97c251, type: 3}
--- !u!1001 &6286447948450706629
PrefabInstance:
m_ObjectHideFlags: 0
@ -991,6 +867,130 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 25cbbba289b6a49d6916bc6215534770, type: 3}
--- !u!1001 &6675434456741144591
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 981190536}
m_Modifications:
- target: {fileID: 6904755265700125194, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_Name
value: PanelResult
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125194, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6904755265700125195, guid: 6ebd5f76171ee4e0b8d96b2eae97c251,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6ebd5f76171ee4e0b8d96b2eae97c251, type: 3}
--- !u!224 &8174312654083100069 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1549853549434864437, guid: 30cc95837c5a74b1ca4757bb85a4abfa,

View File

@ -64,6 +64,7 @@ public class GameLogic : MonoBehaviour
if (tEndingID >= 0)
{
bool tHasNew = PlayerData.Instance.AddEnding(PlayerData.Instance.CurrentLevelID, tEndingID);
bool tHasComplete = tHasNew && (PlayerData.Instance.EndingCountOfLevel(PlayerData.Instance.CurrentLevelID) == tLvData.Endings.Count);
EndingData tEdData = tLvData.Endings[tEndingID];
if (tEdData.IsGoodEnding)
@ -75,12 +76,12 @@ public class GameLogic : MonoBehaviour
{
AudioManager.Instance.PlaySound(AudioType.Lose);
}
tUIResult.Init(PlayerData.Instance.CurrentLevelID, tEdData.EndingName, tEdData.IsGoodEnding, tHasNew, PlayerData.Instance.IsNextLevelPassed());
tUIResult.Init(PlayerData.Instance.CurrentLevelID, tEdData.EndingName, tEdData.IsGoodEnding, PlayerData.Instance.IsNextLevelPassed(), tHasNew, tHasComplete);
}
else
{
AudioManager.Instance.PlaySound(AudioType.Lose);
tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, false, PlayerData.Instance.IsNextLevelPassed());
tUIResult.Init(PlayerData.Instance.CurrentLevelID, "", false, PlayerData.Instance.IsNextLevelPassed());
}
tUIResult.DelAgain = PlayAgain;

View File

@ -43,6 +43,7 @@ public class PlayerData : StorageBase<PlayerData>
if (mCurrentLevel == mUnlockedLevel && mUnlockedLevel < GameConfig.Instance.LevelSort.Count)
{
mUnlockedLevel++;
Save();
}
}

View File

@ -18,7 +18,8 @@ public class ButtonEndings : MonoBehaviour
[SerializeField] Image mImgIcon;
[SerializeField] GameObject mGobTips;
[SerializeField] GameObject mGobNew;
[SerializeField] GameObject mGobNewTag;
[SerializeField] GameObject mGobCompleteTag;
private bool mIsCompleted;
@ -46,6 +47,8 @@ public class ButtonEndings : MonoBehaviour
}
ShowTip(false);
ShowNew(false);
ShowComplete(false);
}
public void ShowTip(bool pShow)
@ -58,18 +61,35 @@ public class ButtonEndings : MonoBehaviour
public void ShowNew(bool pShow)
{
if (mGobNew != null)
if (mGobNewTag != null)
{
mGobNew.SetActive(pShow);
mGobNewTag.SetActive(pShow);
if (pShow)
{
mGobNew.GetComponent<DOTweenAnimation>().DOPlay();
mGobNewTag.transform.localScale = Vector3.zero;
mGobNewTag.transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBounce);
AudioManager.Instance.PlaySound(AudioType.New);
}
}
}
public void ShowComplete(bool pShow)
{
if (mGobCompleteTag != null)
{
mGobCompleteTag.SetActive(pShow);
if (pShow)
{
mGobCompleteTag.transform.localScale = Vector3.zero;
mGobCompleteTag.transform.DOScale(Vector3.one, 0.5f).SetEase(Ease.OutBounce);
AudioManager.Instance.PlaySound(AudioType.Complete);
}
}
}
private void OnClick()
{
ShowTip(false);
DelClick?.Invoke();
}
}

View File

@ -45,7 +45,7 @@ public class PanelResult : BasePanel
mGobFx.SetActive(pFocus);
}
public void Init(int pLevelID, string pEndingName,bool pIsWin, bool pHasNew, bool pNextLevelClear)
public void Init(int pLevelID, string pEndingName, bool pIsWin, bool pNextLevelClear, bool pHasNew = false, bool pHasComplete = false)
{
mTxtEndingName.text = pEndingName;
@ -60,7 +60,22 @@ public class PanelResult : BasePanel
LevelData tLvData = GameConfig.Instance.GetLevelData(pLevelID);
mBtnEndings.Init(pLevelID, PlayerData.Instance.EndingCountOfLevel(pLevelID), tLvData.Endings.Count);
mBtnEndings.ShowNew(pHasNew);
if (pHasNew)
{
if (pHasComplete)
{
TimerManager.Instance.Schedule(() => mBtnEndings.ShowComplete(true), 0.7f);
}
else
{
TimerManager.Instance.Schedule(() => mBtnEndings.ShowNew(true), 0.7f);
}
}
else
{
mBtnEndings.ShowTip(!pIsWin);
}
}
private void OnClickAgain()