diff --git a/Assets/Models/Materials/盆-pen.mat b/Assets/Models/Materials/盆-pen.mat
new file mode 100644
index 0000000..3420f7d
--- /dev/null
+++ b/Assets/Models/Materials/盆-pen.mat
@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: "\u76C6-pen"
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 0.262, g: 0.3867437, b: 0.5, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Models/Materials/盆-pen.mat.meta b/Assets/Models/Materials/盆-pen.mat.meta
new file mode 100644
index 0000000..7141006
--- /dev/null
+++ b/Assets/Models/Materials/盆-pen.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 37beefd2d9f83d34bac8098693632f5c
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Materials/盆-shui.mat b/Assets/Models/Materials/盆-shui.mat
new file mode 100644
index 0000000..48baaf1
--- /dev/null
+++ b/Assets/Models/Materials/盆-shui.mat
@@ -0,0 +1,82 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: "\u76C6-shui"
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ValidKeywords:
+ - _ALPHAPREMULTIPLY_ON
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3000
+ stringTagMap:
+ RenderType: Transparent
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 10
+ - _GlossMapScale: 1
+ - _Glossiness: 0
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 3
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 0
+ m_Colors:
+ - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.5519481}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Models/Materials/盆-shui.mat.meta b/Assets/Models/Materials/盆-shui.mat.meta
new file mode 100644
index 0000000..49df952
--- /dev/null
+++ b/Assets/Models/Materials/盆-shui.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c73f8fb876e711e41925250a84f951db
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/UI/UI_Item/UI_FadePanel/UI_FadePanel.prefab b/Assets/Resources/UI/UI_Item/UI_FadePanel/UI_FadePanel.prefab
index 600d643..ca523ef 100644
--- a/Assets/Resources/UI/UI_Item/UI_FadePanel/UI_FadePanel.prefab
+++ b/Assets/Resources/UI/UI_Item/UI_FadePanel/UI_FadePanel.prefab
@@ -30,6 +30,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 24117921517295134}
+ - {fileID: 2801112473832080997}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -53,7 +54,8 @@ MonoBehaviour:
FadeString: "\u7CBE\u9009\u540E\u7684\u79CD\u5B50\u53EF\u75280.1%\u7684\u78F7\u9178\u4E8C\u6C22\u94BE\u6EB6\u6DB2\u6216\u75283%\u5E7F\u67AF\u5B81\u6C34\u5242\u6D78\u6CE112\uFF5E14\u5C0F\u65F6\uFF0C\u5176\u95F4\u6362\u6C341\uFF5E2\u6B21\uFF0C\u5F85\u79CD\u5B50\u5438\u80C0\u540E\u635E\u8D77\u6EE4\u5E72\uFF0C\u50AC\u82BD\u81F3\u7C89\u5634\u64AD\u79CD\u3002"
FadeBg: {fileID: 7253412348453028916}
FadetextMeshProUGUI: {fileID: 6230927242917436868}
- typeTime: 0.1
+ typeTime: 0.05
+ Next_Btn: {fileID: 3479322861670548154}
--- !u!1 &2479851535666228794
GameObject:
m_ObjectHideFlags: 0
@@ -114,7 +116,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_Color: {r: 0, g: 0, b: 0, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -197,7 +199,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: 3333333
+ m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
@@ -231,6 +233,263 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
+ m_HorizontalAlignment: 1
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &8035729052589537062
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2801112473832080997}
+ - component: {fileID: 8125829168114990122}
+ - component: {fileID: 3846888901053252533}
+ - component: {fileID: 3479322861670548154}
+ m_Layer: 5
+ m_Name: Next_Btn
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &2801112473832080997
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8035729052589537062}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 244419139090749997}
+ m_Father: {fileID: 3576098577725126229}
+ 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: 798, y: -431.34772}
+ m_SizeDelta: {x: 209.8546, y: 67.391}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8125829168114990122
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8035729052589537062}
+ m_CullTransparentMesh: 1
+--- !u!114 &3846888901053252533
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8035729052589537062}
+ 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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ 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 &3479322861670548154
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8035729052589537062}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ 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}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3846888901053252533}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!1 &9091912526032597918
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 244419139090749997}
+ - component: {fileID: 6974058834699505163}
+ - component: {fileID: 9041820047535840285}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &244419139090749997
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9091912526032597918}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2801112473832080997}
+ 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 &6974058834699505163
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9091912526032597918}
+ m_CullTransparentMesh: 1
+--- !u!114 &9041820047535840285
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9091912526032597918}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u4E0B\u4E00\u6B65"
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
+ m_sharedMaterial: {fileID: -4829118149068189727, guid: f8ef5cb2ab4d4da4093d3fe60f978c99, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 33.1
+ m_fontSizeBase: 33.1
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
diff --git a/Assets/Scenes/LiveScene.unity b/Assets/Scenes/LiveScene.unity
index 0f2f3e3..1ab8647 100644
--- a/Assets/Scenes/LiveScene.unity
+++ b/Assets/Scenes/LiveScene.unity
@@ -6129,6 +6129,34 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: -4216859302048453862, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.01
+ objectReference: {fileID: 0}
+ - target: {fileID: -4216859302048453862, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.01
+ objectReference: {fileID: 0}
+ - target: {fileID: -4216859302048453862, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.01
+ objectReference: {fileID: 0}
+ - target: {fileID: -4216859302048453862, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -67
+ objectReference: {fileID: 0}
+ - target: {fileID: -4216859302048453862, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 14.956338
+ objectReference: {fileID: 0}
+ - target: {fileID: -4143083129731981181, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -4143083129731981181, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -22.14
+ objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
propertyPath: m_Name
value: "\u76C6"
@@ -6145,7 +6173,7 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
--- !u!1 &1515684198 stripped
GameObject:
- m_CorrespondingSourceObject: {fileID: -3957782524123411102, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
+ m_CorrespondingSourceObject: {fileID: -4473984409997532297, guid: 2cbec60f0e5cd11498384ea6e6b457e8, type: 3}
m_PrefabInstance: {fileID: 1515684197}
m_PrefabAsset: {fileID: 0}
--- !u!65 &1522992282
@@ -8723,5 +8751,5 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 43.571, y: 180, z: 0}
diff --git a/Assets/Scripts/Project/ProjectBase/CameraManager.cs b/Assets/Scripts/Project/ProjectBase/CameraManager.cs
index 211a87e..a99c3c3 100644
--- a/Assets/Scripts/Project/ProjectBase/CameraManager.cs
+++ b/Assets/Scripts/Project/ProjectBase/CameraManager.cs
@@ -1,6 +1,7 @@
using DG.Tweening;
using System.Collections;
using UnityEngine;
+using UnityEngine.UI;
public class CameraManager : MonoBehaviour
{
@@ -17,6 +18,7 @@ public class CameraManager : MonoBehaviour
public GameObject water_Obj;
+
private void Awake()
{
instance = this;
@@ -69,6 +71,10 @@ public class CameraManager : MonoBehaviour
water_Obj.transform.DOMoveY(0.1f, 1.5f);
yield return new WaitForSeconds(2.5f);
UI_FadePanel.Instance.Init();
- yield return new WaitForSeconds(5f);
+ yield return new WaitForSeconds(9f);
+ UI_FadePanel.Instance.Next_Btn.gameObject.SetActive(true);
+
+
+
}
}
diff --git a/Assets/Scripts/UI_FadePanel.cs b/Assets/Scripts/UI_FadePanel.cs
index b403190..f590274 100644
--- a/Assets/Scripts/UI_FadePanel.cs
+++ b/Assets/Scripts/UI_FadePanel.cs
@@ -5,8 +5,9 @@ using TMPro;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.UI;
+using static Aspose.Pdf.Operator;
-public class UI_FadePanel : MonoBehaviour
+public class UI_FadePanel : BasePanel
{
public static UI_FadePanel Instance;
public string FadeString;
@@ -16,25 +17,47 @@ public class UI_FadePanel : MonoBehaviour
/// Îı¾
///
public TextMeshProUGUI FadetextMeshProUGUI;
- public float typeTime;
- private void Awake()
- {
- Instance = this;
- }
+ public float typeTime;
+
+
+ public Button Next_Btn;
+
+ //public Button Next_Btn;
+ public void Awake()
+ {
+ Instance = this;
+ }
+
+
public void Init()
{
gameObject.SetActive(true);
- FadeBg.DOFade(1,0.1f);
+ FadeBg.DOFade(1,1f);
StartCoroutine(Typing(FadetextMeshProUGUI, FadeString));
-
}
+ public void Start()
+ {
+ Next_Btn.onClick.AddListener(() =>
+ {
+
+ });
+ }
+
public void HidePanel()
{
gameObject.SetActive(false);
}
+
+ ///
+ /// ´ò×Ö»ú
+ ///
+ ///
+ ///
+ ///
public IEnumerator Typing(TextMeshProUGUI text ,string a)
{
+ yield return new WaitForSeconds(1f);
text.text = string.Empty;
string strTemp = string.Empty;
for (int i = 0; i < a.Length; i++)