From 9969ed162f8aa4bd0b977a3c1eba45358eb01f72 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Wed, 25 Nov 2020 17:36:40 +0800
Subject: [PATCH] 修改推拽BUG 调整JSON读取回调 增加新手一大波怪物提示
---
Assets/Resources/UI/Guide/GuidePanel.prefab | 378 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 361 insertions(+), 17 deletions(-)
diff --git a/Assets/Resources/UI/Guide/GuidePanel.prefab b/Assets/Resources/UI/Guide/GuidePanel.prefab
index 069e66c..f9370ba 100644
--- a/Assets/Resources/UI/Guide/GuidePanel.prefab
+++ b/Assets/Resources/UI/Guide/GuidePanel.prefab
@@ -90,6 +90,43 @@
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
+--- !u!1 &456834642854222358
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1725281817447037252}
+ m_Layer: 5
+ m_Name: OffectImage
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1725281817447037252
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 456834642854222358}
+ 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: 2232825125552306022}
+ - {fileID: 669222673568990928}
+ m_Father: {fileID: 5529930024907350475}
+ m_RootOrder: 12
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &631201737652148451
GameObject:
m_ObjectHideFlags: 0
@@ -126,8 +163,8 @@
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: -150, y: -198}
- m_SizeDelta: {x: 150, y: 160}
+ m_AnchoredPosition: {x: -156, y: -124}
+ m_SizeDelta: {x: 120, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1513328901255623773
CanvasRenderer:
@@ -308,7 +345,7 @@
- component: {fileID: 4603625676959611805}
- component: {fileID: 6626706995100142136}
- component: {fileID: 6675823614235448751}
- m_Layer: 0
+ m_Layer: 5
m_Name: Particle System Big
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -324,7 +361,7 @@
m_GameObject: {fileID: 1353751423052021237}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.15, y: 1.2, z: 1.2}
+ m_LocalScale: {x: 1.05, y: 1.2, z: 1.2}
m_Children:
- {fileID: 3861023101606060413}
m_Father: {fileID: 5148880899991696804}
@@ -5188,7 +5225,7 @@
- component: {fileID: 8970830803575095354}
- component: {fileID: 3495814456102969169}
- component: {fileID: 7069841258376608579}
- m_Layer: 0
+ m_Layer: 5
m_Name: Particle System Small
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -10091,8 +10128,8 @@
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: 6, y: -198}
- m_SizeDelta: {x: 150, y: 160}
+ m_AnchoredPosition: {x: 6, y: -124}
+ m_SizeDelta: {x: 120, y: 130}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1008060919980179297
CanvasRenderer:
@@ -10397,7 +10434,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4033919787940865614}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7678627218380787076}
@@ -10407,7 +10444,7 @@
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: -302, y: -549.5}
+ m_AnchoredPosition: {x: 0, y: -451}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &40450391755731747
@@ -10548,6 +10585,85 @@
m_Script: {fileID: 11500000, guid: b853ac60c2d385d4dbc98c0d558451bb, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &4194100260256678997
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3729847023059857890}
+ - component: {fileID: 420363371752327425}
+ - component: {fileID: 4803840975682259644}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3729847023059857890
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4194100260256678997}
+ 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: 5284319985334853514}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &420363371752327425
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4194100260256678997}
+ m_CullTransparentMesh: 0
+--- !u!114 &4803840975682259644
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4194100260256678997}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u5927\u6CE2\u654C\u4EBA\u6765\u88AD"
--- !u!1 &4283419727313149636
GameObject:
m_ObjectHideFlags: 0
@@ -10738,7 +10854,7 @@
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: 302, y: -549.5}
+ m_AnchoredPosition: {x: -165, y: -438}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5571260166908534693
@@ -10769,7 +10885,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: d3feb39977a05c244b9a2c00d63bf309, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 5d8a9333514ab8648a93ef7684841240, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -10895,7 +11011,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6276095933853610772}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5966368840673147708}
@@ -10904,7 +11020,7 @@
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: -701}
+ m_AnchoredPosition: {x: 0, y: -604}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4760460880310566967
@@ -11362,7 +11478,7 @@
- component: {fileID: 3861023101606060413}
- component: {fileID: 4218629426708107943}
- component: {fileID: 6672729224551603335}
- m_Layer: 0
+ m_Layer: 5
m_Name: Particle System (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -11378,7 +11494,7 @@
m_GameObject: {fileID: 7559096288375407272}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1.15, y: 1.2, z: 1.2}
+ m_LocalScale: {x: 1.05, y: 1.2, z: 1.2}
m_Children: []
m_Father: {fileID: 4603625676959611805}
m_RootOrder: 0
@@ -16586,6 +16702,82 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8581094352095596645
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5284319985334853514}
+ - component: {fileID: 3706244911713911788}
+ - component: {fileID: 3573362040006469024}
+ m_Layer: 5
+ m_Name: Image_Warning
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5284319985334853514
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8581094352095596645}
+ 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: 3729847023059857890}
+ m_Father: {fileID: 5529930024907350475}
+ m_RootOrder: 13
+ 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: 700, y: 300}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3706244911713911788
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8581094352095596645}
+ m_CullTransparentMesh: 0
+--- !u!114 &3573362040006469024
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8581094352095596645}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ 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 &8765142430134729489
GameObject:
m_ObjectHideFlags: 0
@@ -16628,6 +16820,8 @@
- {fileID: 1317519610470281476}
- {fileID: 4438159195928217730}
- {fileID: 4727596860417850039}
+ - {fileID: 1725281817447037252}
+ - {fileID: 5284319985334853514}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -16713,7 +16907,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8950312693980221416}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3078043526367245840}
@@ -16722,7 +16916,7 @@
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: -302, y: -701}
+ m_AnchoredPosition: {x: -356, y: -600}
m_SizeDelta: {x: 135, y: 135}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4223709936664550011
@@ -16775,3 +16969,153 @@
m_Script: {fileID: 11500000, guid: cde50e452d90aa04eaf5455075f05942, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &9003939257793759947
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 669222673568990928}
+ - component: {fileID: 775810324338967392}
+ - component: {fileID: 7940261990509441062}
+ m_Layer: 5
+ m_Name: Image (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &669222673568990928
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9003939257793759947}
+ 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: 1725281817447037252}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: 0, y: -250}
+ m_SizeDelta: {x: 0, y: 500}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &775810324338967392
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9003939257793759947}
+ m_CullTransparentMesh: 0
+--- !u!114 &7940261990509441062
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9003939257793759947}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 7545f6da4eda5274396e5021d128679d, 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 &9072938025323439654
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2232825125552306022}
+ - component: {fileID: 1669779624015234029}
+ - component: {fileID: 7219048993191041707}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2232825125552306022
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9072938025323439654}
+ 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: 1725281817447037252}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 250}
+ m_SizeDelta: {x: 0, y: 500}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1669779624015234029
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9072938025323439654}
+ m_CullTransparentMesh: 0
+--- !u!114 &7219048993191041707
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9072938025323439654}
+ 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: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 7545f6da4eda5274396e5021d128679d, 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
--
Gitblit v1.9.1