PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【相机】修改层级、相机相关

iOS_release
zhangaotian 2024-07-26 19:17:22 +08:00
parent 0886f14d17
commit 4e758d277f
12 changed files with 340 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Forest/Assets/Art/GameBuild/Texture/BuildUI/Build_Top.png.meta
View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 200
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

2
Forest/Assets/Art/Gfx/prefab/Effect_Cloud.prefab Executable file → Normal file
View File

@ -4864,7 +4864,7 @@ GameObject:
- component: {fileID: 1534111453748612035}
- component: {fileID: 5083844839630458069}
- component: {fileID: 8718048237657072417}
m_Layer: 5
m_Layer: 0
m_Name: yun
m_TagString: Untagged
m_Icon: {fileID: 0}

8
Forest/Assets/Art/Gfx/prefab/Effect_LevelSpirit.prefab
View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 8671792819691612103}
- component: {fileID: 5284545859753632583}
- component: {fileID: 5381683327659240628}
m_Layer: 0
m_Layer: 12
m_Name: L
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4926,7 +4926,7 @@ GameObject:
- component: {fileID: 5058539718846592305}
- component: {fileID: 8934143187924330201}
- component: {fileID: 3064075876034660122}
m_Layer: 0
m_Layer: 12
m_Name: Effect_LevelSpirit
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -9759,7 +9759,7 @@ GameObject:
- component: {fileID: 2344360770199732186}
- component: {fileID: 2329524095815694493}
- component: {fileID: 4944343502944616990}
m_Layer: 0
m_Layer: 12
m_Name: R
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -14674,7 +14674,7 @@ GameObject:
- component: {fileID: 2452253852337373102}
- component: {fileID: 7159837172115040823}
- component: {fileID: 6798726054285550265}
m_Layer: 0
m_Layer: 12
m_Name: jingling
m_TagString: Untagged
m_Icon: {fileID: 0}

2
Forest/Assets/Art/LevelItem/Thumbtack.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 1411967826526624888}
- component: {fileID: 4766931329653733987}
- component: {fileID: 5866309766382082406}
m_Layer: 0
m_Layer: 8
m_Name: Thumbtack
m_TagString: Untagged
m_Icon: {fileID: 0}

2
Forest/Assets/Art/Texture/Loading/Loading_Bg.jpg.meta
View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 120
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

532
Forest/Assets/Scenes/Build/Build_1.unity
View File

@ -155,6 +155,90 @@ Transform:
- {fileID: 1636750283}
m_Father: {fileID: 279222663}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &28552808
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 28552809}
- component: {fileID: 28552810}
m_Layer: 0
m_Name: Mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &28552809
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 28552808}
serializedVersion: 2
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: 761812202}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &28552810
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 28552808}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 99
m_Sprite: {fileID: 21300000, guid: 83147324783244689a9d72b9fbe03a75, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 0.7529412}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 10.8, y: 19.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &76654113
GameObject:
m_ObjectHideFlags: 0
@ -489,7 +573,7 @@ MonoBehaviour:
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_Bits: 4294967295
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
@ -757,6 +841,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1153247368971935202, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1501056032042821150, guid: e9c96c211fb08417084dbd9a3f85ab3c,
type: 3}
propertyPath: m_IsActive
@ -960,7 +1049,8 @@ PrefabInstance:
Go explore more levels!'
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 5998195394357419975, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9c96c211fb08417084dbd9a3f85ab3c, type: 3}
@ -1134,7 +1224,7 @@ Canvas:
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 15
m_SortingOrder: 101
m_TargetDisplay: 0
--- !u!1 &397456829
GameObject:
@ -1740,9 +1830,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 374389568}
- {fileID: 669029242}
- {fileID: 1768877335}
- {fileID: 1300764260}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &644199645
@ -1790,38 +1877,6 @@ Transform:
- {fileID: 2061371273}
m_Father: {fileID: 1177735644}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &669029241
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 669029242}
m_Layer: 0
m_Name: BuildGfxRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &669029242
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 669029241}
serializedVersion: 2
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: 1299234180}
m_Father: {fileID: 644199644}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &679536468
GameObject:
m_ObjectHideFlags: 0
@ -1995,6 +2050,42 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &761812201
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 761812202}
m_Layer: 0
m_Name: OtherRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &761812202
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 761812201}
serializedVersion: 2
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: 1299234180}
- {fileID: 1300764260}
- {fileID: 1249090787}
- {fileID: 1445594860}
- {fileID: 28552809}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &788619606
GameObject:
m_ObjectHideFlags: 0
@ -2928,81 +3019,6 @@ Transform:
- {fileID: 655320740}
m_Father: {fileID: 76654114}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1199349760
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1199349761}
- component: {fileID: 1199349763}
- component: {fileID: 1199349762}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1199349761
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1199349760}
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: 1768877335}
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!114 &1199349762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1199349760}
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: 83147324783244689a9d72b9fbe03a75, 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!222 &1199349763
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1199349760}
m_CullTransparentMesh: 1
--- !u!1 &1225632190
GameObject:
m_ObjectHideFlags: 0
@ -3373,19 +3389,108 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1249090786
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1249090787}
- component: {fileID: 1249090788}
m_Layer: 0
m_Name: Bg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1249090787
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249090786}
serializedVersion: 2
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: 761812202}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1249090788
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1249090786}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -10
m_Sprite: {fileID: 21300000, guid: 83147324783244689a9d72b9fbe03a75, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 10.8, y: 19.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1299234179
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 669029242}
m_TransformParent: {fileID: 761812202}
m_Modifications:
- target: {fileID: 3173181722133883429, guid: 3227b87917af4fb4a822c24b839b20d8,
type: 3}
propertyPath: m_Name
value: Effect_Cloud
objectReference: {fileID: 0}
- target: {fileID: 3901427855422900987, guid: 3227b87917af4fb4a822c24b839b20d8,
type: 3}
propertyPath: m_SortingOrder
value: -9
objectReference: {fileID: 0}
- target: {fileID: 6061058115687202260, guid: 3227b87917af4fb4a822c24b839b20d8,
type: 3}
propertyPath: m_LocalPosition.x
@ -3394,7 +3499,7 @@ PrefabInstance:
- target: {fileID: 6061058115687202260, guid: 3227b87917af4fb4a822c24b839b20d8,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: -0.11
objectReference: {fileID: 0}
- target: {fileID: 6061058115687202260, guid: 3227b87917af4fb4a822c24b839b20d8,
type: 3}
@ -3439,7 +3544,7 @@ PrefabInstance:
- target: {fileID: 8718048237657072417, guid: 3227b87917af4fb4a822c24b839b20d8,
type: 3}
propertyPath: m_SortingOrder
value: 0
value: -9
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -3477,12 +3582,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1300764259}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 644199644}
m_Father: {fileID: 761812202}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1300764261
SpriteRenderer:
@ -3524,13 +3629,13 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
m_SortingOrder: 100
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 11.6, y: 10.15}
m_Size: {x: 0.425, y: 2.72}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
@ -3811,6 +3916,90 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1445594859
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1445594860}
- component: {fileID: 1445594861}
m_Layer: 0
m_Name: Top
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &1445594860
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445594859}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 3.83, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 761812202}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1445594861
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1445594859}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 94e9a6bcb4a254f3ead700f1c15d51c5, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 10.28, y: 3.42}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1497732327
GameObject:
m_ObjectHideFlags: 0
@ -4202,108 +4391,6 @@ Transform:
- {fileID: 1243376724}
m_Father: {fileID: 1347511408}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1768877334
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1768877335}
- component: {fileID: 1768877338}
- component: {fileID: 1768877337}
- component: {fileID: 1768877336}
m_Layer: 5
m_Name: BuildBGRoot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1768877335
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1768877334}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1199349761}
m_Father: {fileID: 644199644}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &1768877336
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1768877334}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 55
--- !u!114 &1768877337
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1768877334}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 1080, y: 1920}
m_ScreenMatchMode: 1
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!223 &1768877338
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1768877334}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 1
m_Camera: {fileID: 158575877}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 1
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: -10
m_TargetDisplay: 0
--- !u!1 &1919860221
GameObject:
m_ObjectHideFlags: 0
@ -4980,4 +5067,5 @@ SceneRoots:
- {fileID: 1091311623}
- {fileID: 158575881}
- {fileID: 76654114}
- {fileID: 761812202}
- {fileID: 644199644}

4
Forest/Assets/Scenes/StartScene.unity
View File

@ -225,7 +225,7 @@ Camera:
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Bits: 5088
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -331,7 +331,7 @@ Camera:
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 983
m_Bits: 4055
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0

12
Forest/Assets/Scripts/Framework/Event/Events.cs
View File

@ -6,6 +6,7 @@ namespace Framework.Event
{
LevelGameWin,
LevelGameLose,
//LoginSuccess,
LoginFail,
NewBieGuideNext,
@ -23,21 +24,22 @@ namespace Framework.Event
ShowGfx,
AddTime,
LoadingEnd,
//关闭展示 建造UI
HideBuildUI,
ShowBuildUI,
//关闭展示 主界面UI
HideMainUI,
ShowMainUI,
//新手引导
GuideMaskStart, //更换遮罩对象
OpenUI,
OpenUI,
CloseUI,
ChangeBuild, //更换建筑物
EnterGame, //进入关卡
EnterGame, //进入关卡
StartBackToMain,
BackToMain, //回到主界面
}
}

7
Forest/Assets/Scripts/Framework/GameBuild/BuildBoot.cs
View File

@ -368,8 +368,6 @@ public class BuildBoot : MonoBehaviour
GameObject.Find("BuildCamera").Destroy();
var canvas = transform.Find("BuildUIRoot").GetComponent<Canvas>();
canvas.worldCamera = BuildManager.Instance.CurBuildCamera;
var bgCanvas = transform.Find("BuildBGRoot").GetComponent<Canvas>();
bgCanvas.worldCamera = BuildManager.Instance.CurBuildCamera;
}
/// <summary>
@ -422,8 +420,9 @@ public class BuildBoot : MonoBehaviour
private void InitUI()
{
//选择时UI
_mask = transform.Find("BuildUIRoot/UIMainBuild/Mask").gameObject;
_pickItem = transform.Find("PickItem").gameObject;
var otherRoot = GameObject.Find("OtherRoot").gameObject;
_mask =otherRoot.transform.Find("Mask").gameObject;
_pickItem = GameObject.Find("OtherRoot/PickItem").gameObject;
_pickSpriteRenderer = _pickItem.GetComponent<SpriteRenderer>();
_uiMainBuild = transform.Find("BuildUIRoot/UIMainBuild").gameObject;

7
Forest/Assets/Scripts/Framework/Guide/GuideComplete.cs
View File

@ -134,11 +134,18 @@ internal sealed class EnterStartScene : GuideCompleteBase
public override void AddListener()
{
EventManager.Instance.Register(EventManager.EventName.StartBackToMain, StartBackToMain);
EventManager.Instance.Register(EventManager.EventName.BackToMain, Complete);
}
public override void RemoveListener()
{
EventManager.Instance.Unregister(EventManager.EventName.StartBackToMain, StartBackToMain);
EventManager.Instance.Unregister(EventManager.EventName.BackToMain, Complete);
}
private void StartBackToMain()
{
GuideMananger.Instance.SetActiveGuideUI(false);
}
}

1
Forest/Assets/Scripts/Gameplay/UI/EndPanel/UIWinPanelController.cs
View File

@ -76,6 +76,7 @@ public class UIWinPanelController : UIWindow
CloseWindow();
UIManager.Instance.CloseWindow(UIConstants.UILevelPanel, true);
GameStateManager.Instance.ChangeState(new GameStateStart());
EventManager.Instance.Send(EventManager.EventName.StartBackToMain);
}
private void RefreshCoins()

4
Forest/ProjectSettings/TagManager.asset
View File

@ -13,11 +13,11 @@ TagManager:
- UI
- Plank
- Hole
- Move
- Thumbtack
- HoleOfPlank
- BuildItem
- BuildBubble
-
- LevelGfx
-
-
-