From d4eadbf1bac0dba434d4c35e60e643143e770faa Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 11 Dec 2020 19:56:00 +0800
Subject: [PATCH] 新手引导
---
Assets/UI/GuideUser/结束弹版.png.meta | 2
Assets/UI/GuideUser/雪糕.png | 0
Assets/UI/GuideUser/玉米字.png | 0
Assets/UI/GuideUser/结束弹版.png | 0
Assets/UI/GuideUser/光.png | 0
Assets/Resources/UI/Guide/GuidePanel.prefab | 406 ++++++++++++++++++----------------------
Assets/UI/GuideUser/元素标志3.png | 0
Assets/UI/GuideUser/玉米枪手.png | 0
Assets/UI/GuideUser/火鸡.png.meta | 2
Assets/UI/GuideUser/雪糕字.png.meta | 2
Assets/UI/GuideUser/雪糕字.png | 0
Assets/UI/GuideUser/底条.png | 0
Assets/UI/GuideUser/对话框.png.meta | 2
Assets/UI/GuideUser/火鸡字.png.meta | 2
Assets/UI/GuideUser/光.png.meta | 2
Assets/UI/GuideUser/玉米字.png.meta | 2
Assets/UI/GuideUser/组 143.png.meta | 2
Assets/UI/GuideUser/组 143.png | 0
Assets/UI/GuideUser/宝箱.png | 0
/dev/null | 118 -----------
Assets/UI/GuideUser/元素标志2.png | 0
Assets/Scripts/Guide/GuidePanelNew.cs | 34 ++
Assets/UI/GuideUser/火鸡.png | 0
Assets/UI/GuideUser/精灵宝箱.png | 0
Assets/UI/GuideUser/愤怒小鸡.png | 0
Assets/UI/GuideUser/玉米.png.meta | 2
Assets/UI/GuideUser/玉米.png | 0
Assets/UI/GuideUser/箱子字.png | 0
Assets/UI/GuideUser/底条.png.meta | 2
Assets/UI/GuideUser/火鸡字.png | 0
Assets/UI/GuideUser/对话框.png | 0
Assets/UI/GuideUser/箱子字.png.meta | 2
Assets/UI/GuideUser/雪糕.png.meta | 2
Assets/UI/GuideUser/雪糕投手.png | 0
Assets/UI/GuideUser/元素标志1.png | 0
35 files changed, 222 insertions(+), 360 deletions(-)
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png" "b/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png"
deleted file mode 100644
index c065e72..0000000
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png"
+++ /dev/null
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\2761.png" "b/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\2761.png"
deleted file mode 100644
index 64a1a94..0000000
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\2761.png"
+++ /dev/null
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\2761.png.meta" "b/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\2761.png.meta"
deleted file mode 100644
index affbd31..0000000
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\2761.png.meta"
+++ /dev/null
@@ -1,118 +0,0 @@
-fileFormatVersion: 2
-guid: 1fd7ba574459cc649b50983b74057f38
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- mipmaps:
- mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 1
- linearTexture: 0
- fadeOut: 0
- borderMipMap: 0
- mipMapsPreserveCoverage: 0
- alphaTestReferenceValue: 0.5
- mipMapFadeDistanceStart: 1
- mipMapFadeDistanceEnd: 3
- bumpmap:
- convertToNormalMap: 0
- externalNormalMap: 0
- heightScale: 0.25
- normalMapFilter: 0
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- vTOnly: 0
- grayScaleToAlpha: 0
- generateCubemap: 6
- cubemapConvolution: 0
- seamlessCubemap: 0
- textureFormat: 1
- maxTextureSize: 2048
- textureSettings:
- serializedVersion: 2
- filterMode: -1
- aniso: -1
- mipBias: -100
- wrapU: 1
- wrapV: 1
- wrapW: -1
- nPOTScale: 0
- lightmap: 0
- compressionQuality: 50
- spriteMode: 1
- spriteExtrude: 1
- spriteMeshType: 1
- alignment: 0
- spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 100
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
- spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
- spriteTessellationDetail: -1
- textureType: 8
- textureShape: 1
- singleChannelComponent: 0
- maxTextureSizeSet: 0
- compressionQualitySet: 0
- textureFormatSet: 0
- ignorePngGamma: 0
- applyGammaDecoding: 0
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Standalone
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- - serializedVersion: 3
- buildTarget: Android
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID: 5e97eb03825dee720800000000000000
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Resources/UI/Guide/GuidePanel.prefab b/Assets/Resources/UI/Guide/GuidePanel.prefab
index 3f428a1..eb0bc56 100644
--- a/Assets/Resources/UI/Guide/GuidePanel.prefab
+++ b/Assets/Resources/UI/Guide/GuidePanel.prefab
@@ -120,7 +120,7 @@
- {fileID: 2232825125552306022}
- {fileID: 669222673568990928}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 12
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -261,7 +261,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 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
@@ -352,7 +352,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5529930024907350475}
- 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}
@@ -439,12 +439,12 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4438159195928217730}
- m_RootOrder: 2
+ 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: 242.09998, y: 288.99988}
- m_SizeDelta: {x: 388, y: 556}
+ m_AnchoredPosition: {x: 213, y: 286}
+ m_SizeDelta: {x: 519.2, y: 552}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9035724820279435823
CanvasRenderer:
@@ -474,7 +474,7 @@
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 25833e82014527345bae562aea9f169c, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 6f3058c4388112d40af3c5ed5abf7429, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -10424,7 +10424,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5529930024907350475}
- 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}
@@ -10481,6 +10481,81 @@
m_Script: {fileID: 11500000, guid: 08591e45701808d45b20afc9a724f2f5, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &2934285719281405272
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4760073031140276832}
+ - component: {fileID: 4879527996989336127}
+ - component: {fileID: 9206115451282919384}
+ m_Layer: 5
+ m_Name: DialogBoxBackground
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4760073031140276832
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2934285719281405272}
+ 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: 4438159195928217730}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 637.57, y: 270}
+ m_SizeDelta: {x: 641, y: 220}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4879527996989336127
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2934285719281405272}
+ m_CullTransparentMesh: 0
+--- !u!114 &9206115451282919384
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2934285719281405272}
+ 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 0258418171808114487029dc03def0b9, 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 &3212171093681048507
GameObject:
m_ObjectHideFlags: 0
@@ -10601,12 +10676,12 @@
- component: {fileID: 8980380663272306294}
- component: {fileID: 5134647675084066298}
m_Layer: 5
- m_Name: Button
+ m_Name: FinishImageBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &3949634408599583466
RectTransform:
m_ObjectHideFlags: 0
@@ -10617,9 +10692,10 @@
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_Children:
+ - {fileID: 7795890778731430349}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 0
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -10647,7 +10723,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 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
@@ -10682,7 +10758,7 @@
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
- m_Transition: 1
+ m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -10743,7 +10819,7 @@
- {fileID: 5671372037864146043}
- {fileID: 4866253993228027618}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 4
+ 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}
@@ -10830,7 +10906,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 11
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10875,6 +10951,81 @@
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4634067063161324839
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7795890778731430349}
+ - component: {fileID: 7093034685954399392}
+ - component: {fileID: 794009886415209164}
+ m_Layer: 5
+ m_Name: FinishImage
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7795890778731430349
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4634067063161324839}
+ 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: 3949634408599583466}
+ 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: -39, y: 63}
+ m_SizeDelta: {x: 579, y: 337}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7093034685954399392
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4634067063161324839}
+ m_CullTransparentMesh: 0
+--- !u!114 &794009886415209164
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4634067063161324839}
+ 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 8e25e449b538bf242a1c50b594e9cb10, 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 &5368746784615156827
GameObject:
m_ObjectHideFlags: 0
@@ -10901,7 +11052,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5368746784615156827}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -0.00000099109}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4438159195928217730}
@@ -10909,8 +11060,8 @@
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 711.23, y: 326.16}
- m_SizeDelta: {x: 493, y: 143}
+ m_AnchoredPosition: {x: 670, y: 270}
+ m_SizeDelta: {x: 505, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7160825793490662973
CanvasRenderer:
@@ -10933,7 +11084,7 @@
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.38431373, g: 0.40784314, b: 0.44313726, a: 1}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -10943,7 +11094,7 @@
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 36
- m_FontStyle: 2
+ m_FontStyle: 1
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
@@ -10989,7 +11140,7 @@
- {fileID: 5749082204771179013}
- {fileID: 1376111069480638087}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 6
+ 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}
@@ -11081,7 +11232,7 @@
- {fileID: 7506719627085037032}
- {fileID: 8300337399051184320}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 7
+ 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}
@@ -11170,7 +11321,7 @@
- {fileID: 4603625676959611805}
- {fileID: 8970830803575095354}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 8
+ m_RootOrder: 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}
@@ -11250,7 +11401,7 @@
- {fileID: 5535747459750983881}
- {fileID: 7222998258621314287}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 5
+ 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}
@@ -11338,7 +11489,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 3
+ 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}
@@ -16926,7 +17077,7 @@
m_Children:
- {fileID: 4744861380638265637}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 9
+ m_RootOrder: 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}
@@ -17000,12 +17151,12 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3396256655537851812}
- - {fileID: 8731406972072197911}
- {fileID: 2917232209471019437}
+ - {fileID: 4760073031140276832}
- {fileID: 4822198964131571939}
- {fileID: 1791147882484238855}
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -17025,81 +17176,6 @@
m_Name:
m_EditorClassIdentifier:
letterPause: 0.1
---- !u!1 &8407174266227041596
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8731406972072197911}
- - component: {fileID: 6467812568231410178}
- - component: {fileID: 5983846002469993101}
- m_Layer: 5
- m_Name: DialogBoxBackground
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &8731406972072197911
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8407174266227041596}
- 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: 4438159195928217730}
- 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: 665, y: 317}
- m_SizeDelta: {x: 662, y: 189}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6467812568231410178
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8407174266227041596}
- m_CullTransparentMesh: 0
---- !u!114 &5983846002469993101
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8407174266227041596}
- 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 8c413a20aa221ed439a6f02b8f67eddc, 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 &8581094352095596645
GameObject:
m_ObjectHideFlags: 0
@@ -17130,7 +17206,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5529930024907350475}
- m_RootOrder: 13
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -17205,7 +17281,6 @@
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 3949634408599583466}
- {fileID: 142515581731452029}
- {fileID: 4359018530067976343}
- {fileID: 8763532979211854271}
@@ -17220,7 +17295,7 @@
- {fileID: 1725281817447037252}
- {fileID: 5284319985334853514}
- {fileID: 6734668191369589492}
- - {fileID: 767591575309379950}
+ - {fileID: 3949634408599583466}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -17673,121 +17748,6 @@
m_CorrespondingSourceObject: {fileID: 7844127999702205425, guid: fbd3cb7333b82a54eb55c6522c430dd9,
type: 3}
m_PrefabInstance: {fileID: 2300011441008667441}
- m_PrefabAsset: {fileID: 0}
---- !u!1001 &2311656066066081264
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 5529930024907350475}
- m_Modifications:
- - target: {fileID: 1335499092167296360, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_Layer
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 2449791801456558011, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: playOnAwake
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3075780154458313392, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: playOnAwake
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 400
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_RootOrder
- value: 15
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 15
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 15
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 15
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523167, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_Name
- value: Effect_UI_YinDaoJieShu
- objectReference: {fileID: 0}
- - target: {fileID: 3076994875172523167, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_Layer
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 6275672227110818141, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- propertyPath: m_Layer
- value: 5
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 052c2c582cb1908499d0454aefab6a68, type: 3}
---- !u!4 &767591575309379950 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 3076994875172523166, guid: 052c2c582cb1908499d0454aefab6a68,
- type: 3}
- m_PrefabInstance: {fileID: 2311656066066081264}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4785850214538834053
PrefabInstance:
@@ -18569,7 +18529,7 @@
- target: {fileID: 3329837434862512135, guid: 95122db9d9a91b943a8066f8e3b4becd,
type: 3}
propertyPath: m_RootOrder
- value: 14
+ value: 13
objectReference: {fileID: 0}
- target: {fileID: 3329837434862512135, guid: 95122db9d9a91b943a8066f8e3b4becd,
type: 3}
diff --git a/Assets/Scripts/Guide/GuidePanelNew.cs b/Assets/Scripts/Guide/GuidePanelNew.cs
index 5e595ac..8d4d214 100644
--- a/Assets/Scripts/Guide/GuidePanelNew.cs
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs
@@ -39,7 +39,9 @@
ImageTowerPos towerPos3;//塔位标识
Image tmpMask;//自身的阻挡射线Panel
- ParticleSystem finishPS;
+ //ParticleSystem finishPS;
+ Button finishBtn;
+ Image finishImg;
void Awake()
{
tmpMask = transform.GetComponent<Image>();
@@ -139,7 +141,12 @@
skillBtn = GameObject.Find("UICamera/BottomCanvas/Panel/Energy/FireSkillBg/SkillBtn").GetComponent<Button>();
skillBtn.interactable = false;
- finishPS = transform.Find("Effect_UI_YinDaoJieShu/Particle System (3)").GetComponent<ParticleSystem>();
+ finishBtn = transform.Find("FinishImageBtn").GetComponent<Button>();
+ finishImg = finishBtn.transform.Find("FinishImage").GetComponent<Image>();
+ finishImg.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f);
+ finishBtn.onClick.AddListener(OnClickFinish);
+ finishBtn.gameObject.SetActive(false);
+ //finishPS = transform.Find("Effect_UI_YinDaoJieShu/Particle System (3)").GetComponent<ParticleSystem>();
towerBuyBtn.gameObject.SetActive(false);
}
@@ -646,13 +653,26 @@
CloseGuidance();
SetGuideUI(true);
- //StartShowWord(str, ac);
+ callBack = ac;
+ StartShowWord(str, ShowFinishPanel);
+ // charForeach.StartFinalShowWord(str, ac, () =>
+ // {
+ // finishPS.Play();
+ // });
- charForeach.StartFinalShowWord(str, ac, () =>
- {
- finishPS.Play();
- });
+ }
+ private void ShowFinishPanel()
+ {
+ SetGuideUI(false);
+ //显示引导结束面板，再次点击按钮关闭
+ finishBtn.gameObject.SetActive(true);
+ finishImg.transform.DOScale(Vector3.one, 0.5f);
+ }
+
+ private void OnClickFinish()
+ {
+ callBack?.Invoke();
}
diff --git "a/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2271.png" "b/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2271.png"
index 055895d..a45418c 100644
--- "a/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2271.png"
+++ "b/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2271.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2272.png" "b/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2272.png"
index b6f4bdf..28403bb 100644
--- "a/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2272.png"
+++ "b/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2272.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2273.png" "b/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2273.png"
index 7e7be65..eb3ff62 100644
--- "a/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2273.png"
+++ "b/Assets/UI/GuideUser/\345\205\203\347\264\240\346\240\207\345\277\2273.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\345\205\211.png" "b/Assets/UI/GuideUser/\345\205\211.png"
new file mode 100644
index 0000000..75a50a4
--- /dev/null
+++ "b/Assets/UI/GuideUser/\345\205\211.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\345\205\211.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\345\205\211.png.meta"
index 79bde8c..af0f4a1 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\345\205\211.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 596a300e037669c4b9f2dbd9c16af1b5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\345\256\235\347\256\261.png" "b/Assets/UI/GuideUser/\345\256\235\347\256\261.png"
index a0bcc81..344fc81 100644
--- "a/Assets/UI/GuideUser/\345\256\235\347\256\261.png"
+++ "b/Assets/UI/GuideUser/\345\256\235\347\256\261.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\345\257\271\350\257\235\346\241\206.png" "b/Assets/UI/GuideUser/\345\257\271\350\257\235\346\241\206.png"
new file mode 100644
index 0000000..a612842
--- /dev/null
+++ "b/Assets/UI/GuideUser/\345\257\271\350\257\235\346\241\206.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\345\257\271\350\257\235\346\241\206.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\345\257\271\350\257\235\346\241\206.png.meta"
index 79bde8c..efd5b90 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\345\257\271\350\257\235\346\241\206.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 0258418171808114487029dc03def0b9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\345\272\225\346\235\241.png" "b/Assets/UI/GuideUser/\345\272\225\346\235\241.png"
new file mode 100644
index 0000000..10d6350
--- /dev/null
+++ "b/Assets/UI/GuideUser/\345\272\225\346\235\241.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\345\272\225\346\235\241.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\345\272\225\346\235\241.png.meta"
index 79bde8c..fad6ab1 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\345\272\225\346\235\241.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 76012926da90c4344a3cfdda2a088033
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\346\204\244\346\200\222\345\260\217\351\270\241.png" "b/Assets/UI/GuideUser/\346\204\244\346\200\222\345\260\217\351\270\241.png"
index a4b0271..b9e4858 100644
--- "a/Assets/UI/GuideUser/\346\204\244\346\200\222\345\260\217\351\270\241.png"
+++ "b/Assets/UI/GuideUser/\346\204\244\346\200\222\345\260\217\351\270\241.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\347\201\253\351\270\241.png" "b/Assets/UI/GuideUser/\347\201\253\351\270\241.png"
new file mode 100644
index 0000000..08695de
--- /dev/null
+++ "b/Assets/UI/GuideUser/\347\201\253\351\270\241.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\347\201\253\351\270\241.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\347\201\253\351\270\241.png.meta"
index 79bde8c..e804d42 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\347\201\253\351\270\241.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 6f3058c4388112d40af3c5ed5abf7429
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\347\201\253\351\270\241\345\255\227.png" "b/Assets/UI/GuideUser/\347\201\253\351\270\241\345\255\227.png"
new file mode 100644
index 0000000..e636667
--- /dev/null
+++ "b/Assets/UI/GuideUser/\347\201\253\351\270\241\345\255\227.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\347\201\253\351\270\241\345\255\227.png.meta"
similarity index 98%
rename from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
rename to "Assets/UI/GuideUser/\347\201\253\351\270\241\345\255\227.png.meta"
index 79bde8c..00358fb 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\347\201\253\351\270\241\345\255\227.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 660c73069db82f24c8f4460b01b2b15f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\347\216\211\347\261\263.png" "b/Assets/UI/GuideUser/\347\216\211\347\261\263.png"
new file mode 100644
index 0000000..0aa2598
--- /dev/null
+++ "b/Assets/UI/GuideUser/\347\216\211\347\261\263.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\347\216\211\347\261\263.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\347\216\211\347\261\263.png.meta"
index 79bde8c..d809d3f 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\347\216\211\347\261\263.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 2e88501cf6517bd448468557f47f823c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\347\216\211\347\261\263\345\255\227.png" "b/Assets/UI/GuideUser/\347\216\211\347\261\263\345\255\227.png"
new file mode 100644
index 0000000..8967584
--- /dev/null
+++ "b/Assets/UI/GuideUser/\347\216\211\347\261\263\345\255\227.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\347\216\211\347\261\263\345\255\227.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\347\216\211\347\261\263\345\255\227.png.meta"
index 79bde8c..2303331 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\347\216\211\347\261\263\345\255\227.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 9e410002674ecf743a294f28c1c54857
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\347\216\211\347\261\263\346\236\252\346\211\213.png" "b/Assets/UI/GuideUser/\347\216\211\347\261\263\346\236\252\346\211\213.png"
index db47f70..45db91a 100644
--- "a/Assets/UI/GuideUser/\347\216\211\347\261\263\346\236\252\346\211\213.png"
+++ "b/Assets/UI/GuideUser/\347\216\211\347\261\263\346\236\252\346\211\213.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\347\256\261\345\255\220\345\255\227.png" "b/Assets/UI/GuideUser/\347\256\261\345\255\220\345\255\227.png"
new file mode 100644
index 0000000..bd17ad6
--- /dev/null
+++ "b/Assets/UI/GuideUser/\347\256\261\345\255\220\345\255\227.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\347\256\261\345\255\220\345\255\227.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\347\256\261\345\255\220\345\255\227.png.meta"
index 79bde8c..76c508c 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\347\256\261\345\255\220\345\255\227.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: e9ddee44309c5294bb82894336a99ab8
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\347\262\276\347\201\265\345\256\235\347\256\261.png" "b/Assets/UI/GuideUser/\347\262\276\347\201\265\345\256\235\347\256\261.png"
index 462a8f5..dd2d438 100644
--- "a/Assets/UI/GuideUser/\347\262\276\347\201\265\345\256\235\347\256\261.png"
+++ "b/Assets/UI/GuideUser/\347\262\276\347\201\265\345\256\235\347\256\261.png"
Binary files differ
diff --git "a/Assets/UI/GuideUser/\347\273\204 143.png" "b/Assets/UI/GuideUser/\347\273\204 143.png"
new file mode 100644
index 0000000..11d7d0c
--- /dev/null
+++ "b/Assets/UI/GuideUser/\347\273\204 143.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\347\273\204 143.png.meta"
similarity index 97%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\347\273\204 143.png.meta"
index 79bde8c..bb5e8f0 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\347\273\204 143.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 612c4dc3938c89f4db504a967327caf9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\347\273\223\346\235\237\345\274\271\347\211\210.png" "b/Assets/UI/GuideUser/\347\273\223\346\235\237\345\274\271\347\211\210.png"
new file mode 100644
index 0000000..ea7a325
--- /dev/null
+++ "b/Assets/UI/GuideUser/\347\273\223\346\235\237\345\274\271\347\211\210.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\347\273\223\346\235\237\345\274\271\347\211\210.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\347\273\223\346\235\237\345\274\271\347\211\210.png.meta"
index 79bde8c..5c1c52a 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\347\273\223\346\235\237\345\274\271\347\211\210.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 8e25e449b538bf242a1c50b594e9cb10
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\351\233\252\347\263\225.png" "b/Assets/UI/GuideUser/\351\233\252\347\263\225.png"
new file mode 100644
index 0000000..3f22e60
--- /dev/null
+++ "b/Assets/UI/GuideUser/\351\233\252\347\263\225.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\351\233\252\347\263\225.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\351\233\252\347\263\225.png.meta"
index 79bde8c..95cf9d6 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\351\233\252\347\263\225.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: d2d7060db23896c4eb0f5c43242e8a02
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\351\233\252\347\263\225\345\255\227.png" "b/Assets/UI/GuideUser/\351\233\252\347\263\225\345\255\227.png"
new file mode 100644
index 0000000..4986c6e
--- /dev/null
+++ "b/Assets/UI/GuideUser/\351\233\252\347\263\225\345\255\227.png"
Binary files differ
diff --git "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta" "b/Assets/UI/GuideUser/\351\233\252\347\263\225\345\255\227.png.meta"
similarity index 98%
copy from "Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
copy to "Assets/UI/GuideUser/\351\233\252\347\263\225\345\255\227.png.meta"
index 79bde8c..6696246 100644
--- "a/Assets/Prefabs/UI/GuideUI/\346\225\210\346\236\234\345\233\276.png.meta"
+++ "b/Assets/UI/GuideUser/\351\233\252\347\263\225\345\255\227.png.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 524f1300df3ed7c48a34ed2e1b5bc5b6
+guid: 674f0f82e9540c446a916470c5d74f44
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
diff --git "a/Assets/UI/GuideUser/\351\233\252\347\263\225\346\212\225\346\211\213.png" "b/Assets/UI/GuideUser/\351\233\252\347\263\225\346\212\225\346\211\213.png"
index 911f597..23330a1 100644
--- "a/Assets/UI/GuideUser/\351\233\252\347\263\225\346\212\225\346\211\213.png"
+++ "b/Assets/UI/GuideUser/\351\233\252\347\263\225\346\212\225\346\211\213.png"
Binary files differ
--
Gitblit v1.9.1