From e7d47746394db8f2705a99028293e24e43ad9231 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Sun, 4 Apr 2021 18:12:34 -0400 Subject: [PATCH 01/24] button prefab --- .../PopSignMain/Prefabs/CustomizeLevel.meta | 8 + .../CustomizeLevelButton.prefab | 199 ++++++++++++++++++ .../CustomizeLevelButton.prefab.meta | 7 + Assets/PopSignMain/Scenes/map.unity | 135 +++++++++++- .../Scripts/CustomizeLevelScript.meta | 8 + .../CustomizeLevelButtonHandler.cs | 18 ++ .../CustomizeLevelButtonHandler.cs.meta | 11 + .../PopSignMain/Textures/customizeLevel.meta | 8 + .../Textures/customizeLevel/clb.png | Bin 0 -> 4421 bytes .../Textures/customizeLevel/clb.png.meta | 92 ++++++++ 10 files changed, 477 insertions(+), 9 deletions(-) create mode 100644 Assets/PopSignMain/Prefabs/CustomizeLevel.meta create mode 100644 Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab create mode 100644 Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab.meta create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript.meta create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs.meta create mode 100644 Assets/PopSignMain/Textures/customizeLevel.meta create mode 100644 Assets/PopSignMain/Textures/customizeLevel/clb.png create mode 100644 Assets/PopSignMain/Textures/customizeLevel/clb.png.meta diff --git a/Assets/PopSignMain/Prefabs/CustomizeLevel.meta b/Assets/PopSignMain/Prefabs/CustomizeLevel.meta new file mode 100644 index 00000000..ae249576 --- /dev/null +++ b/Assets/PopSignMain/Prefabs/CustomizeLevel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d32aabab8829a7740a4969f209755e5e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab b/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab new file mode 100644 index 00000000..4c9aea44 --- /dev/null +++ b/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab @@ -0,0 +1,199 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &572213018082232120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 572213018082232123} + - component: {fileID: 572213018082232125} + - component: {fileID: 572213018082232122} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &572213018082232123 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572213018082232120} + 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: 572213018735744529} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210, y: -50} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &572213018082232125 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572213018082232120} + m_CullTransparentMesh: 0 +--- !u!114 &572213018082232122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572213018082232120} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Customize Level +--- !u!1 &572213018735744622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 572213018735744529} + - component: {fileID: 572213018735744530} + - component: {fileID: 572213018735744531} + - component: {fileID: 572213018735744528} + m_Layer: 5 + m_Name: CustomizeLevelButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &572213018735744529 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572213018735744622} + 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: 572213018082232123} + m_Father: {fileID: 0} + 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: 0, y: -550} + m_SizeDelta: {x: 420, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &572213018735744530 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572213018735744622} + m_CullTransparentMesh: 0 +--- !u!114 &572213018735744531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572213018735744622} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 92d9400c76a39ec479e55b313bd2d356, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &572213018735744528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572213018735744622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 572213018735744531} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab.meta b/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab.meta new file mode 100644 index 00000000..dc578c03 --- /dev/null +++ b/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bb97b9a36adebd247b8f6293c5ea0cb2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Scenes/map.unity b/Assets/PopSignMain/Scenes/map.unity index 1e173966..67f91e96 100644 --- a/Assets/PopSignMain/Scenes/map.unity +++ b/Assets/PopSignMain/Scenes/map.unity @@ -1444,6 +1444,131 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} +--- !u!1001 &883513465 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1885843549} + m_Modifications: + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -550 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_SizeDelta.x + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_SizeDelta.y + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 572213018735744622, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_Name + value: CustomizeLevelButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb97b9a36adebd247b8f6293c5ea0cb2, type: 3} +--- !u!224 &883513466 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + m_PrefabInstance: {fileID: 883513465} + m_PrefabAsset: {fileID: 0} --- !u!1 &888727183 GameObject: m_ObjectHideFlags: 0 @@ -2850,15 +2975,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e57121ad395ad444a41b4513802e01f, type: 3} m_Name: m_EditorClassIdentifier: - sprites: - - {fileID: 21300000, guid: c9d38b47f8b3c2e4faa2ef03c763dea6, type: 3} - - {fileID: 21300000, guid: c16eb65f597e8494abe11e23663f5f4b, type: 3} - - {fileID: 21300000, guid: 252bd4574ae1d9a4aa39f00a3ac1332a, type: 3} - - {fileID: 21300000, guid: 106bd95171c358c45a7100c11e49b91c, type: 3} - - {fileID: 21300000, guid: bdd748563cec13f46b8731df24007ef7, type: 3} - - {fileID: 21300000, guid: 19ca967f222c60b4f8b0507c89abadcc, type: 3} - - {fileID: 21300000, guid: 2c287bacbf8a03a419eea29290b502e7, type: 3} - backgrounds: [] --- !u!4 &1557464959 Transform: m_ObjectHideFlags: 0 @@ -2986,6 +3102,7 @@ RectTransform: - {fileID: 1487227249} - {fileID: 683644415} - {fileID: 629368647} + - {fileID: 883513466} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript.meta new file mode 100644 index 00000000..b94f0958 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe78794c432040646b4070c5b29c022f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs new file mode 100644 index 00000000..2bb45713 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CustomizeLevelButtonHandler : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs.meta new file mode 100644 index 00000000..7a7ecefa --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c0ce52419564a184c8d3235e16cb8307 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Textures/customizeLevel.meta b/Assets/PopSignMain/Textures/customizeLevel.meta new file mode 100644 index 00000000..05e26781 --- /dev/null +++ b/Assets/PopSignMain/Textures/customizeLevel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69420ae1254515b4f99afece169e34eb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Textures/customizeLevel/clb.png b/Assets/PopSignMain/Textures/customizeLevel/clb.png new file mode 100644 index 0000000000000000000000000000000000000000..90eb37b94e7136457110794d639245892a44ebba GIT binary patch literal 4421 zcmV-L5xVY)P)c=kc>dM*U$>#&k*(i={ndQ!W|(R5Ud^!O^nDzm|AFs@CFdBl}$1x zm1smT!Zbk#gbhHrJ#3ONDMSN;RYBMdf-PYL!t}vzHlpD=*lpsrhz8`sLnDM{HsaVw zi;kgw)_UVIYwx?kT6?=$Z+uvU7$XqwB&xD!LC9kZ^NJu8vn55PJS_usBoc`?1A)M9 zIJemZF=3(s$%>N6WRuV5YfP69Nwn?amu&atGn{Ay!o30{+Hy2~&b(NKs*I94Nn zh(;hx7p$*%h;8}yW5#P}MqavfX<4RZ%amw7@VsmR$HzMT0&1_NNB_!>fhUnbm~KEX z<)@3j$HIXu*R^;&{;OaxxL!olI!V$J4c+&k!FS1Y|PHiUa41rueuNj zgi)A0kilT^sj8|fKhqqID$y)pqP279&SJ>?gkAyKr33IK{TGJfrbK$uZDX5a?+I39_`V%#Aj%|}i&vB{3F zySp0)abb65w5E|jFu^pRhRO=LR9jo?lS+*fO{%zXIE)(YTYABBLw$@uAh=<2@xy#t z0UnMYKkh6vmM0e4l)b&ZKFCy|7d%gn5CXvn)3zPJq00RHe9o;^t5!Kgvmt_uA}zRh zNB80<5T+YU8VwPNL{eUx3E-crSFc)KU0vMk$Or_&WWWc`MeFR@vq-oECt7Q3t90*^ zMk5d=0kdY!vcMsN4n`h#-21a<&nBV~2$O{V{(hB9mP53jo*tfHDrDM}gg_u<4t-?^ zZlQHa&r}!)G6I3%hG|D*;E-#ZZb>v-1k7|x&s0PjjX*F0zfhwi8jYf|;)<)Tu8uDV zacQ)Hfq~xcxxjDh@$sE&8uc?Y*6;JlJ)jz%jlFXznr z=%bHr-nw<`h+cS2`2&nVAdCXP7ODfe^Wldd-ptF(OG-{*y0g~N@ApdvCcu1j5v{S} zAx0n&M$uU5=EV8)=Rbi%vahdCYBPsutfi&J?(FQu9aed0Y;63!UI9*8llPH87(qkX z14gs)z4zWb0Ec8@VPUeXt1Ds4mp$o8~^s2m}Ih;SpCF za^|hK-s;TF&5gr(5;$e+FMhJ)$B(0`!w|=?Z{NOO>lL9!GufpC!c2mfHbc&YLZLX! zMRSEEIK|@}A52JG0+IuvAS){?zq`A8S2!H5Q!DEj>SK$J?Du>Rhd`LlKu;rn zlu#$y(9lppqyerHhkqeUQ<&eEkq87XwA*dc71(4Hyyz>iA;>W{PN5Hf?4i1y;A&$ z_ImO{5@s0C^WIQa?Meqn;$K#-T!~-BjSmhE@}XBnMMXmRK{(Xy=IqwiR=g4i*Cf|! zh)tU|y_rZPB6{Wcwfcp$G>b4pfPH-{^m!dXtjn7>Z~iT6vuHGm3W}SHz@?=6sa^f6 z7jiBwCJMy1Z{L2Qt*vc`>E>vw64?mT9r9!GCLB6+=yz|w{q_YIYDFQ60lAaV^QFA# ziR&H3w|IjE1qHcKI4_w@=D{)d)TvV&!S4KlUI98qmLB~Z?fpoYmXIVfz5M*uS6}_{ z!3Q7wIcT$f;0W%?h+&W!$d;nfgsQXa>gp1=ZrzIc{r)I26)GBDvu4eXNF;JfznT2h zD2>?&(+xN#!@g}I8SvvYknERmI;?3k9HS-m{HD)<+SS$7m~l853}WFStmw1PKD!13 zzE{vDHI(6Fwq5fU8{ar35T+8sfgtbCrZE`;Iq>@Hum6ON46mX}K$1D@8&w#$mxGBm zeuTLJJjjo#`M&=8>%^r?mkvGs^wUoP30*!;RI|^ORI;1#7@3lUDG6MV@ux?YuocDM zFkVNJty{P5l^r{FoM$6uA_kl@;~EXU_rj@|g0%ZMf(dEkevi0y7C0cSKp^06Z*Ly} zvK?HuY}q211;0-(gK8GZ)=*wegdDMNSuaj92z|xH#RJ!`U*~2c z5G}=}uVO5sSulz1KYjXi5a!lGFnNt+n*|l-0E@Fh!v**5-TTavB}>-8jCk1?b#c|@4EyxSA`l7Oo{0Z@RyzlVg!@Gb7e}Hpzb|9(H zRO~M*DjFy(ER1$^bi~q;43Wu(sd9`Kgi5n--n^L$=egjC%to?ddP76QH=CN8)>c(j ztzZPgG(k^K&#{dgH*S9S-FG_$$xxFa$p*vW@Bk3{$I_n&;>C4gjn z#Rph(12A;rL}RIw)Am?(X1oQsMmE06UyRvMtA#}HgJ8ZbTef`Xg%@6Em_2*;LPj7= z5hw&Z3ehAekpw6a?z)G*J_LPxpufLgk}M-lCNbW<_N5sq$(AibjyPt4Fah`v!1JwL zyS5z6$|vW|oA(5fj&Lsm$#vnvg=65dZ#j7IAg=7-+j&5U;X(}+WM&fX25|lhv{T=;Yu8S9c6MU8ynXxjV}}kMia;N=K{==| zK1-4f`Fy@8Tp!BL&W>KadX=yI7|Zct!bHCwBX`g8mzI_WySuyj*bPV%f(PQRe=&9o zz|jwa`BBS(!18_;#8bYup`669M^Cd#N@Y1Hd|a{hK_0}jiPo^*N>@oBsITUPV1;?p>}v# zuTrP25Y{r?E1hg2&DPq$Qsq|C85_U6M!A&EW|`zP)#>$IhIUQ4KlAu~nDYCY(shD+ z{Im6xMT^^-Og8kzB=kXN*Ec4#m=dI;V;D@uxG)uy%wu^~CYX%xp{a!P!&oecnhd4^ z(0t?ptjYkGl>wOt^TWe(!ZGawh>(si!Z}AhT{}qjVdDW|4Gu30bpS;fHHOQrF615(FO@EFwa;4N|YQHqk;Sfr;ulhS^?czKWc6QMQ zde!)>mY2*K^aE3UOx#z7BSSL6~chzQ0K z>vf2_ZLj=#Syf)I=M#DGcgv*huYIgam-2##l^+`L?Yo&CX+sJo>(lEWGcBlWrF`YIH+}*B!={iOhcut zs~(xI9&rE+^M_vbI`@?Iz>&wXJWM^}u6~xhms&=ZL6=LHPrwp#>h)q>wkT%_8C=hy z-)pRPF~wDRlzP=RaAfqTKZVd9_j20D1pT?xcEPgHHv9;`nMxQ*G=9X7y8sCjVqa5L zd)+pk`l8+*j1WPjxw^jIu37yP2F6>6{qOz2tMr_Ls7toJev-e*Io4 z@+sGu`WxxLpHe2J9p&@s_te`+X>Xnf`Wb#D36Bhp@`X&DRC3HV^nt$ji@_=jP`!Km5}Q zY4W6dcB5R{b9=U*8VtXY6BL;| Date: Sun, 4 Apr 2021 18:17:39 -0400 Subject: [PATCH 02/24] button function --- .../CustomizeLevelButton.prefab | 210 ++++++++------- Assets/PopSignMain/Scenes/map.unity | 242 +++++++++--------- .../CustomizeLevelButtonHandler.cs | 12 +- 3 files changed, 241 insertions(+), 223 deletions(-) diff --git a/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab b/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab index 4c9aea44..8bb961a4 100644 --- a/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab +++ b/Assets/PopSignMain/Prefabs/CustomizeLevel/CustomizeLevelButton.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &572213018082232120 +--- !u!1 &1626109992592064979 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,88 +8,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 572213018082232123} - - component: {fileID: 572213018082232125} - - component: {fileID: 572213018082232122} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &572213018082232123 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572213018082232120} - 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: 572213018735744529} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 210, y: -50} - m_SizeDelta: {x: 400, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &572213018082232125 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572213018082232120} - m_CullTransparentMesh: 0 ---- !u!114 &572213018082232122 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572213018082232120} - 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: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Customize Level ---- !u!1 &572213018735744622 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 572213018735744529} - - component: {fileID: 572213018735744530} - - component: {fileID: 572213018735744531} - - component: {fileID: 572213018735744528} + - component: {fileID: 1626109992064982075} + - component: {fileID: 1626109992592064980} + - component: {fileID: 1626109992592064981} + - component: {fileID: 1626109992592064978} + - component: {fileID: 1626109992592064983} m_Layer: 5 m_Name: CustomizeLevelButton m_TagString: Untagged @@ -97,18 +20,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &572213018735744529 +--- !u!224 &1626109992064982075 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572213018735744622} + m_GameObject: {fileID: 1626109992592064979} 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: 572213018082232123} + - {fileID: 1626109993588531546} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -117,21 +40,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -550} m_SizeDelta: {x: 420, y: 120} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &572213018735744530 +--- !u!222 &1626109992592064980 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572213018735744622} + m_GameObject: {fileID: 1626109992592064979} m_CullTransparentMesh: 0 ---- !u!114 &572213018735744531 +--- !u!114 &1626109992592064981 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572213018735744622} + m_GameObject: {fileID: 1626109992592064979} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -154,13 +77,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &572213018735744528 +--- !u!114 &1626109992592064978 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572213018735744622} + m_GameObject: {fileID: 1626109992592064979} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -193,7 +116,108 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 572213018735744531} + m_TargetGraphic: {fileID: 1626109992592064981} m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1626109992592064983} + m_MethodName: handleButtonPressed + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1626109992592064983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1626109992592064979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0ce52419564a184c8d3235e16cb8307, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1626109993588531547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1626109993588531546} + - component: {fileID: 1626109993588531548} + - component: {fileID: 1626109993588531549} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1626109993588531546 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1626109993588531547} + 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: 1626109992064982075} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210, y: -50} + m_SizeDelta: {x: 400, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1626109993588531548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1626109993588531547} + m_CullTransparentMesh: 0 +--- !u!114 &1626109993588531549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1626109993588531547} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Customize Level diff --git a/Assets/PopSignMain/Scenes/map.unity b/Assets/PopSignMain/Scenes/map.unity index 67f91e96..48fb38b8 100644 --- a/Assets/PopSignMain/Scenes/map.unity +++ b/Assets/PopSignMain/Scenes/map.unity @@ -1444,130 +1444,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} ---- !u!1001 &883513465 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1885843549} - m_Modifications: - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -550 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_SizeDelta.x - value: 420 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_SizeDelta.y - value: 120 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 572213018735744622, guid: bb97b9a36adebd247b8f6293c5ea0cb2, - type: 3} - propertyPath: m_Name - value: CustomizeLevelButton - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bb97b9a36adebd247b8f6293c5ea0cb2, type: 3} --- !u!224 &883513466 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 572213018735744529, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + m_CorrespondingSourceObject: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, type: 3} - m_PrefabInstance: {fileID: 883513465} + m_PrefabInstance: {fileID: 1626109992389461057} m_PrefabAsset: {fileID: 0} --- !u!1 &888727183 GameObject: @@ -3232,3 +3113,122 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} +--- !u!1001 &1626109992389461057 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1885843549} + m_Modifications: + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -550 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_SizeDelta.x + value: 420 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_SizeDelta.y + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1626109992064982075, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1626109992592064979, guid: bb97b9a36adebd247b8f6293c5ea0cb2, + type: 3} + propertyPath: m_Name + value: CustomizeLevelButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb97b9a36adebd247b8f6293c5ea0cb2, type: 3} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs index 2bb45713..54335c01 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs @@ -1,18 +1,12 @@ using System.Collections; using System.Collections.Generic; +using UnityEngine.SceneManagement; using UnityEngine; public class CustomizeLevelButtonHandler : MonoBehaviour { - // Start is called before the first frame update - void Start() + public void handleButtonPressed () { - - } - - // Update is called once per frame - void Update() - { - + SceneManager.LoadScene("wordlist"); } } From 5b27922667ba4ad7f0f54bc28b4b726fafb37929 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Sun, 11 Apr 2021 15:04:07 -0400 Subject: [PATCH 03/24] make check mark --- .../Prefabs/GUI/ScrollButton.prefab | 810 +++++++++++------- .../PopSignMain/Scripts/GUI/ScrollButton.cs | 1 + Assets/PopSignMain/Scripts/GUI/ScrollView.cs | 4 +- 3 files changed, 497 insertions(+), 318 deletions(-) diff --git a/Assets/PopSignMain/Prefabs/GUI/ScrollButton.prefab b/Assets/PopSignMain/Prefabs/GUI/ScrollButton.prefab index 05bbd270..2323e02d 100644 --- a/Assets/PopSignMain/Prefabs/GUI/ScrollButton.prefab +++ b/Assets/PopSignMain/Prefabs/GUI/ScrollButton.prefab @@ -1,22 +1,12 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1655864962192918} - m_IsPrefabParent: 1 --- !u!1 &1120359199533176 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 224522854340650662} - component: {fileID: 222117119660763200} @@ -29,123 +19,52 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1263840558208226 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224813065803411486} - - component: {fileID: 222744523480961644} - - component: {fileID: 114007734036101100} - m_Layer: 5 - m_Name: PlayIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1620629753709298 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224832583093558454} - - component: {fileID: 222196879476400080} - - component: {fileID: 114709978513116280} - m_Layer: 5 - m_Name: Checkmark - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1655864962192918 -GameObject: +--- !u!224 &224522854340650662 +RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224896478763752036} - - component: {fileID: 222500279497627470} - - component: {fileID: 114797942112498860} - - component: {fileID: 114332017817631968} - - component: {fileID: 114521922537530750} - - component: {fileID: 114838317318120080} - m_Layer: 5 - m_Name: ScrollButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1961923970293808 -GameObject: + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120359199533176} + 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: 224896478763752036} + 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: -258.00006, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222117119660763200 +CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 224278972184547488} - - component: {fileID: 222992156218254004} - - component: {fileID: 114498456020471418} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &114007734036101100 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1263840558208226} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: e0beaac8b4d5240ffb48599ad7ff8b3a, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120359199533176} + m_CullTransparentMesh: 0 --- !u!114 &114153604365932922 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120359199533176} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: d34fc869803354697b1d144c18383a44, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -154,15 +73,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114332017817631968 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &114710632404072706 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1655864962192918} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120359199533176} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -173,28 +95,31 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 0} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 114797942112498860} + m_TargetGraphic: {fileID: 114153604365932922} m_OnClick: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114521922537530750} - m_MethodName: ButtonClick + m_MethodName: ToggleSelection m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -204,75 +129,72 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &114498456020471418 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1961923970293808} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.33333334, b: 0.5647059, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 60 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Original Button ---- !u!114 &114521922537530750 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1655864962192918} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 917d7391550ec469793cf7b54abcf426, type: 3} - m_Name: - m_EditorClassIdentifier: - ButtonText: {fileID: 114498456020471418} - ScrollView: {fileID: 0} - checkmark: {fileID: 1620629753709298} ---- !u!114 &114709978513116280 +--- !u!1 &1263840558208226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224813065803411486} + - component: {fileID: 222744523480961644} + - component: {fileID: 114007734036101100} + - component: {fileID: 7109097885862978492} + m_Layer: 5 + m_Name: PlayIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224813065803411486 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263840558208226} + 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: 224896478763752036} + 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} + m_AnchoredPosition: {x: 251, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222744523480961644 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263840558208226} + m_CullTransparentMesh: 0 +--- !u!114 &114007734036101100 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1620629753709298} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263840558208226} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: e0beaac8b4d5240ffb48599ad7ff8b3a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -280,15 +202,18 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114710632404072706 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7109097885862978492 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1120359199533176} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263840558208226} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -302,25 +227,28 @@ MonoBehaviour: 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: 114153604365932922} + m_TargetGraphic: {fileID: 114007734036101100} m_OnClick: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114521922537530750} - m_MethodName: ToggleSelection + m_MethodName: ButtonClick m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -330,153 +258,161 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &114797942112498860 +--- !u!1 &1620629753709298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224832583093558454} + - component: {fileID: 222196879476400080} + - component: {fileID: 114709978513116280} + - component: {fileID: 6011247556345466897} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224832583093558454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620629753709298} + 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: 224896478763752036} + 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} + m_AnchoredPosition: {x: -258, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222196879476400080 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620629753709298} + m_CullTransparentMesh: 0 +--- !u!114 &114709978513116280 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1655864962192918} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620629753709298} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &114838317318120080 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6011247556345466897 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1655864962192918} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1620629753709298} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aeeeef44c0b9e4c69b9eb592325eba92, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &222117119660763200 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1120359199533176} ---- !u!222 &222196879476400080 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1620629753709298} ---- !u!222 &222500279497627470 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1655864962192918} ---- !u!222 &222744523480961644 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1263840558208226} ---- !u!222 &222992156218254004 -CanvasRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1961923970293808} ---- !u!224 &224278972184547488 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1961923970293808} - 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: 224896478763752036} - 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: 1, y: 0} - m_SizeDelta: {x: -152.1, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224522854340650662 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1120359199533176} - 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: 224896478763752036} - 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: -258.00006, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224813065803411486 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1263840558208226} - 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: 224896478763752036} - 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} - m_AnchoredPosition: {x: 251, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!224 &224832583093558454 -RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1620629753709298} - 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: 224896478763752036} - 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} - m_AnchoredPosition: {x: -258, y: 0} - m_SizeDelta: {x: 40, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_Navigation: + m_Mode: 3 + 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: 114709978513116280} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114521922537530750} + m_MethodName: ToggleSelection + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &1655864962192918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224896478763752036} + - component: {fileID: 222500279497627470} + - component: {fileID: 114797942112498860} + - component: {fileID: 114332017817631968} + - component: {fileID: 114521922537530750} + m_Layer: 5 + m_Name: ScrollButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!224 &224896478763752036 RectTransform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1655864962192918} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -494,3 +430,243 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.50000006} +--- !u!222 &222500279497627470 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655864962192918} + m_CullTransparentMesh: 0 +--- !u!114 &114797942112498860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655864962192918} + 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_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 &114332017817631968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655864962192918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 0} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 114797942112498860} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114521922537530750} + m_MethodName: ButtonClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 0 +--- !u!114 &114521922537530750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1655864962192918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 917d7391550ec469793cf7b54abcf426, type: 3} + m_Name: + m_EditorClassIdentifier: + ButtonText: {fileID: 114498456020471418} + ScrollView: {fileID: 0} + checkmark: {fileID: 1620629753709298} + CheckBox: {fileID: 1120359199533176} +--- !u!1 &1961923970293808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 224278972184547488} + - component: {fileID: 222992156218254004} + - component: {fileID: 114498456020471418} + - component: {fileID: 3248542181081668927} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &224278972184547488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961923970293808} + 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: 224896478763752036} + 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: 1, y: 0} + m_SizeDelta: {x: -152.1, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &222992156218254004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961923970293808} + m_CullTransparentMesh: 0 +--- !u!114 &114498456020471418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961923970293808} + 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, g: 0.33333334, b: 0.5647059, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 60 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Original Button +--- !u!114 &3248542181081668927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961923970293808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 114498456020471418} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 114521922537530750} + m_MethodName: ButtonClick + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 diff --git a/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs b/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs index bcbb5883..355b0037 100644 --- a/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs +++ b/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs @@ -9,6 +9,7 @@ public class ScrollButton : MonoBehaviour { public Text ButtonText; public ScrollView ScrollView; public GameObject checkmark; + public GameObject CheckBox; public void Start() { diff --git a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs index dc66ef38..c8a6534e 100644 --- a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs +++ b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs @@ -58,7 +58,9 @@ void Start () go.tag = "cloned"; ScrollButton sb = go.GetComponent(); sb.SetName(str); - go.transform.SetParent(ButtonTemplate.transform.parent); + sb.ButtonText.transform.localPosition = new Vector3(77, 0, 0); + sb.CheckBox.SetActive(true); + go.transform.SetParent(ButtonTemplate.transform.parent); go.transform.localScale = new Vector3(1, 1, 1); go.transform.localPosition = new Vector3(250, yPos, 0); yPos -= 100; From 6ad298d5d8ff5b9b5cf1e5231091141f2e9d63d4 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Sun, 11 Apr 2021 15:18:49 -0400 Subject: [PATCH 04/24] customizelevelmanager basics --- Assets/PopSignMain/Scenes/map.unity | 44 +++++++++++++++++++ .../Scripts/Core/AnimationManager.cs | 4 ++ .../CustomizeLevelButtonHandler.cs | 1 + .../CustomizeLevelManager.cs | 30 +++++++++++++ .../CustomizeLevelManager.cs.meta | 11 +++++ Assets/PopSignMain/Scripts/GUI/ScrollView.cs | 8 +++- 6 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs.meta diff --git a/Assets/PopSignMain/Scenes/map.unity b/Assets/PopSignMain/Scenes/map.unity index 48fb38b8..13cf5ffb 100644 --- a/Assets/PopSignMain/Scenes/map.unity +++ b/Assets/PopSignMain/Scenes/map.unity @@ -1837,6 +1837,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1049910403} m_CullTransparentMesh: 0 +--- !u!1 &1083859715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1083859717} + - component: {fileID: 1083859716} + m_Layer: 0 + m_Name: CustomizeLevelManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1083859716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1083859715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 389020395c67e27408be5f03749fe3fd, type: 3} + m_Name: + m_EditorClassIdentifier: + tryingToCustomize: 0 +--- !u!4 &1083859717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1083859715} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.2299603, y: 0.875678, z: 78.958984} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1117028918 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs index 3fbf6f0b..800a6413 100644 --- a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs +++ b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs @@ -189,6 +189,10 @@ public void ShowWordList() public void CloseReview() { + if (CustomizeLevelManager.Instance.tryingToCustomize) + { + CustomizeLevelManager.Instance.tryingToCustomize = false; + } SceneManager.LoadScene("map"); } diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs index 54335c01..3a828c88 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelButtonHandler.cs @@ -7,6 +7,7 @@ public class CustomizeLevelButtonHandler : MonoBehaviour { public void handleButtonPressed () { + CustomizeLevelManager.Instance.tryingToCustomize = true; SceneManager.LoadScene("wordlist"); } } diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs new file mode 100644 index 00000000..995d2c0b --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CustomizeLevelManager : MonoBehaviour +{ + static public CustomizeLevelManager Instance; + public bool tryingToCustomize = false; + public HashSet selectedWord = new HashSet(); + + void Awake() + { + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(Instance); + } + } + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs.meta new file mode 100644 index 00000000..eac44c2f --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 389020395c67e27408be5f03749fe3fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs index c8a6534e..e92546c9 100644 --- a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs +++ b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs @@ -58,8 +58,12 @@ void Start () go.tag = "cloned"; ScrollButton sb = go.GetComponent(); sb.SetName(str); - sb.ButtonText.transform.localPosition = new Vector3(77, 0, 0); - sb.CheckBox.SetActive(true); + + if (CustomizeLevelManager.Instance.tryingToCustomize) + { + sb.ButtonText.transform.localPosition = new Vector3(77, 0, 0); + sb.CheckBox.SetActive(true); + } go.transform.SetParent(ButtonTemplate.transform.parent); go.transform.localScale = new Vector3(1, 1, 1); go.transform.localPosition = new Vector3(250, yPos, 0); From acea6f6e05ec5e3949e215451714b4349a95a4c4 Mon Sep 17 00:00:00 2001 From: ConnorPeng Date: Sun, 18 Apr 2021 15:00:06 -0400 Subject: [PATCH 05/24] Created custom list --- Assets/PopSignMain/Scripts/GUI/ScrollButton.cs | 6 ++++++ Assets/PopSignMain/Scripts/GUI/ScrollView.cs | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs b/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs index 355b0037..9ebefd88 100644 --- a/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs +++ b/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs @@ -29,13 +29,19 @@ public void ButtonClick() public void ToggleSelection() { + int size = CustomizeLevelManager.Instance.selectedWord.Count; + if (size >= 5 & !selected) { + return; + } if(selected) { checkmark.SetActive(false); } else { + checkmark.SetActive(true); + } selected = !selected; ScrollView.UpdateSelection(Name, selected); diff --git a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs index e92546c9..69cbac1e 100644 --- a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs +++ b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs @@ -6,6 +6,7 @@ using System.IO; using System.Linq; + public class ScrollView : MonoBehaviour { VideoManager sharedVideoManager; ReviewVideo reviewManager; @@ -173,7 +174,12 @@ public void PreviousWord() public void UpdateSelection(string word, bool selected) { - + HashSet set = CustomizeLevelManager.Instance.selectedWord; + if (selected) { + set.Add(word); + } else { + set.Remove(word); + } } void CreateCustomLevel() From 45f698e914ac88162481272657663ce344c58503 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Sun, 18 Apr 2021 15:25:08 -0400 Subject: [PATCH 06/24] change explanation --- Assets/PopSignMain/Scenes/wordlist.unity | 14 +++++++ .../WordListContentChangeOnWordSelection.cs | 40 +++++++++++++++++++ ...rdListContentChangeOnWordSelection.cs.meta | 11 +++++ .../PopSignMain/Scripts/GUI/ScrollButton.cs | 4 ++ Assets/PopSignMain/Scripts/GUI/ScrollView.cs | 6 ++- 5 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs.meta diff --git a/Assets/PopSignMain/Scenes/wordlist.unity b/Assets/PopSignMain/Scenes/wordlist.unity index bd384588..daeeab8e 100644 --- a/Assets/PopSignMain/Scenes/wordlist.unity +++ b/Assets/PopSignMain/Scenes/wordlist.unity @@ -1752,6 +1752,7 @@ GameObject: - component: {fileID: 1054722310} - component: {fileID: 1054722309} - component: {fileID: 1054722308} + - component: {fileID: 1054722311} m_Layer: 5 m_Name: WordListExplanation m_TagString: Untagged @@ -1839,6 +1840,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054722306} m_CullTransparentMesh: 0 +--- !u!114 &1054722311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054722306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 683706d49ea48ff42a13d9d033cb41a0, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 1054722309} --- !u!1 &1197801492 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs new file mode 100644 index 00000000..786b3d8b --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs @@ -0,0 +1,40 @@ +using System; +using System.Text; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class WordListContentChangeOnWordSelection : MonoBehaviour +{ + public UnityEngine.UI.Text text; + // Start is called before the first frame update + void Start() + { + text.text = "Tap any word to see its video. Select 5 words to create a custom practice level."; + } + + // Update is called once per frame + void Update() + { + CustomizeLevelManager clm = CustomizeLevelManager.Instance; + string content = "Tap any word to see its video. Select 5 words to create a custom practice level."; + if (clm != null) + { + HashSet set = clm.selectedWord; + if (set.Count > 0) + { + StringBuilder sb = new StringBuilder(); + foreach (string str in set) + { + sb.Append(str + ", "); + } + + content = "Selected " + sb.ToString() + " select " + (5 - set.Count) + " more words."; + + } + } + text.text = content; + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs.meta new file mode 100644 index 00000000..569abb8d --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 683706d49ea48ff42a13d9d033cb41a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs b/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs index 9ebefd88..32efdc95 100644 --- a/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs +++ b/Assets/PopSignMain/Scripts/GUI/ScrollButton.cs @@ -29,6 +29,10 @@ public void ButtonClick() public void ToggleSelection() { + if (CustomizeLevelManager.Instance == null) + { + return; + } int size = CustomizeLevelManager.Instance.selectedWord.Count; if (size >= 5 & !selected) { return; diff --git a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs index 69cbac1e..f69bf7df 100644 --- a/Assets/PopSignMain/Scripts/GUI/ScrollView.cs +++ b/Assets/PopSignMain/Scripts/GUI/ScrollView.cs @@ -174,7 +174,11 @@ public void PreviousWord() public void UpdateSelection(string word, bool selected) { - HashSet set = CustomizeLevelManager.Instance.selectedWord; + if (CustomizeLevelManager.Instance == null) + { + return; + } + HashSet set = CustomizeLevelManager.Instance.selectedWord; if (selected) { set.Add(word); } else { From a1bf8c226f8ab6819847b3f5b27bca9f3a5dd647 Mon Sep 17 00:00:00 2001 From: ConnorPeng Date: Sun, 25 Apr 2021 20:43:39 -0400 Subject: [PATCH 07/24] custom level--change title Changed the title when user click custom level. --- Assets/PopSignMain/Scenes/wordlist-new.unity | 1342 ++++++++++------- Assets/PopSignMain/Scenes/wordlist.unity | 14 + .../CustomizeLevelScript/changetitle.cs | 28 + .../CustomizeLevelScript/changetitle.cs.meta | 11 + 4 files changed, 832 insertions(+), 563 deletions(-) create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs.meta diff --git a/Assets/PopSignMain/Scenes/wordlist-new.unity b/Assets/PopSignMain/Scenes/wordlist-new.unity index 40c842e3..2263df43 100644 --- a/Assets/PopSignMain/Scenes/wordlist-new.unity +++ b/Assets/PopSignMain/Scenes/wordlist-new.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,20 +50,19 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 12 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 0 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 0 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -88,7 +94,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 0 --- !u!196 &5 @@ -116,9 +124,10 @@ NavMeshSettings: --- !u!1 &13137776 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 13137778} - component: {fileID: 13137777} @@ -132,8 +141,9 @@ GameObject: --- !u!212 &13137777 SpriteRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 13137776} m_Enabled: 1 m_CastShadows: 0 @@ -142,6 +152,9 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -151,6 +164,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -173,11 +187,13 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &13137778 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 13137776} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.2, y: 0, z: 59.6} @@ -187,154 +203,155 @@ Transform: m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &81617893 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 1484499179} m_Modifications: + - target: {fileID: 1120359199533176, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1620629753709298, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1655864962192918, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114498456020471418, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + propertyPath: m_Color.r + value: 0.24705882 + objectReference: {fileID: 0} + - target: {fileID: 114498456020471418, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + propertyPath: m_Color.g + value: 0.30980393 + objectReference: {fileID: 0} + - target: {fileID: 114498456020471418, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + propertyPath: m_Color.b + value: 0.3019608 + objectReference: {fileID: 0} + - target: {fileID: 114521922537530750, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + propertyPath: ScrollView + value: + objectReference: {fileID: 422203623} + - target: {fileID: 224278972184547488, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 7.049988 + objectReference: {fileID: 0} + - target: {fileID: 224278972184547488, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.x value: 315 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_AnchoredPosition.y value: -29.999996 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_SizeDelta.x value: 600 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_SizeDelta.y value: 60 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - target: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} + type: 3} propertyPath: m_Pivot.y value: 0.50000006 objectReference: {fileID: 0} - - target: {fileID: 114521922537530750, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - propertyPath: ScrollView - value: - objectReference: {fileID: 422203623} - - target: {fileID: 1655864962192918, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1120359199533176, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1620629753709298, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224278972184547488, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - propertyPath: m_AnchoredPosition.x - value: 7.050002 - objectReference: {fileID: 0} - - target: {fileID: 224278972184547488, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 114498456020471418, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - propertyPath: m_Color.r - value: 0.24705882 - objectReference: {fileID: 0} - - target: {fileID: 114498456020471418, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - propertyPath: m_Color.g - value: 0.30980393 - objectReference: {fileID: 0} - - target: {fileID: 114498456020471418, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - propertyPath: m_Color.b - value: 0.3019608 - objectReference: {fileID: 0} m_RemovedComponents: - - {fileID: 114838317318120080, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 2} - m_ParentPrefab: {fileID: 100100000, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 2} - m_IsPrefabParent: 0 + - {fileID: 114838317318120080, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 412ef45fb77d34b8d866c6faf07b0cf7, type: 3} --- !u!1 &110500072 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 110500073} - component: {fileID: 110500076} @@ -349,9 +366,10 @@ GameObject: --- !u!224 &110500073 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110500072} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -368,23 +386,23 @@ RectTransform: --- !u!114 &110500075 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110500072} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.24705882, g: 0.30980393, b: 0.3019608, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 110 @@ -402,16 +420,20 @@ MonoBehaviour: --- !u!222 &110500076 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 110500072} + m_CullTransparentMesh: 0 --- !u!1 &127189971 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100056, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100056, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 127189972} - component: {fileID: 127189977} @@ -426,9 +448,10 @@ GameObject: --- !u!224 &127189972 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400056, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400056, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127189971} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -446,9 +469,10 @@ RectTransform: --- !u!114 &127189973 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400000, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127189971} m_Enabled: 1 m_EditorHideFlags: 0 @@ -459,16 +483,19 @@ MonoBehaviour: --- !u!222 &127189977 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200056, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200056, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127189971} + m_CullTransparentMesh: 0 --- !u!1 &237249412 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 237249413} - component: {fileID: 237249416} @@ -484,8 +511,9 @@ GameObject: --- !u!224 &237249413 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237249412} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -502,12 +530,13 @@ RectTransform: --- !u!114 &237249414 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237249412} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -521,17 +550,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 237249415} @@ -549,27 +581,25 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &237249415 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237249412} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 10dd0d2c20eb84d5fac816c60903a8f5, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -578,18 +608,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &237249416 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237249412} + m_CullTransparentMesh: 0 --- !u!1 &261210430 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 261210431} - component: {fileID: 261210433} @@ -604,8 +639,9 @@ GameObject: --- !u!224 &261210431 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261210430} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -622,22 +658,22 @@ RectTransform: --- !u!114 &261210432 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261210430} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.30980393, g: 0.73333335, b: 0.6431373, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 25 @@ -655,15 +691,18 @@ MonoBehaviour: --- !u!222 &261210433 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261210430} + m_CullTransparentMesh: 0 --- !u!1 &361183758 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 361183759} - component: {fileID: 361183761} @@ -678,8 +717,9 @@ GameObject: --- !u!224 &361183759 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361183758} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -696,22 +736,22 @@ RectTransform: --- !u!114 &361183760 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361183758} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 10dd0d2c20eb84d5fac816c60903a8f5, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -720,18 +760,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &361183761 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361183758} + m_CullTransparentMesh: 0 --- !u!1 &377073301 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100050, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100050, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 377073302} - component: {fileID: 377073307} @@ -749,9 +795,10 @@ GameObject: --- !u!224 &377073302 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400050, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400050, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377073301} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -770,9 +817,10 @@ RectTransform: Animator: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 9500002, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 9500002, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377073301} m_Enabled: 0 m_Avatar: {fileID: 0} @@ -784,12 +832,14 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!111 &377073304 Animation: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11100002, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11100002, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377073301} m_Enabled: 0 serializedVersion: 3 @@ -803,13 +853,14 @@ Animation: --- !u!114 &377073305 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400080, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400080, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377073301} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -823,17 +874,20 @@ MonoBehaviour: m_NormalColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5019608} m_HighlightedColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.69803923} m_PressedColor: {r: 0.34509805, g: 0.34509805, b: 0.34509805, a: 0.69803923} + m_SelectedColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.69803923} m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} m_ColorMultiplier: 2 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 377073306} @@ -851,28 +905,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &377073306 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400082, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400082, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377073301} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + 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: 0} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -881,23 +933,27 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &377073307 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200050, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200050, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 377073301} + m_CullTransparentMesh: 0 --- !u!1 &382868941 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 382868946} - component: {fileID: 382868945} - - component: {fileID: 382868944} - component: {fileID: 382868943} - component: {fileID: 382868942} - component: {fileID: 382868947} @@ -911,34 +967,36 @@ GameObject: --- !u!81 &382868942 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382868941} m_Enabled: 1 --- !u!124 &382868943 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 382868941} - m_Enabled: 1 ---- !u!92 &382868944 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382868941} m_Enabled: 1 --- !u!20 &382868945 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382868941} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -968,8 +1026,9 @@ Camera: --- !u!4 &382868946 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382868941} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -981,8 +1040,9 @@ Transform: --- !u!114 &382868947 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382868941} m_Enabled: 1 m_EditorHideFlags: 0 @@ -993,9 +1053,11 @@ MonoBehaviour: --- !u!1 &386362322 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100054, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100054, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 386362323} - component: {fileID: 386362325} @@ -1011,9 +1073,10 @@ GameObject: --- !u!224 &386362323 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400054, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400054, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 386362322} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1041,23 +1104,23 @@ RectTransform: --- !u!114 &386362324 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400086, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400086, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 386362322} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + 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: 0.84313726} m_RaycastTarget: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1066,31 +1129,37 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &386362325 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200054, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200054, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 386362322} + m_CullTransparentMesh: 0 --- !u!114 &386362326 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 386362322} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 --- !u!1 &411570265 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 411570266} - component: {fileID: 411570268} @@ -1105,8 +1174,9 @@ GameObject: --- !u!224 &411570266 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411570265} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1123,22 +1193,22 @@ RectTransform: --- !u!114 &411570267 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411570265} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 0.5} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 40 @@ -1156,15 +1226,18 @@ MonoBehaviour: --- !u!222 &411570268 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411570265} + m_CullTransparentMesh: 0 --- !u!1 &422203617 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 422203618} - component: {fileID: 422203622} @@ -1182,8 +1255,9 @@ GameObject: --- !u!224 &422203618 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422203617} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1201,24 +1275,26 @@ RectTransform: --- !u!114 &422203619 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422203617} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 --- !u!114 &422203620 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422203617} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: m_Content: {fileID: 1484499179} @@ -1239,27 +1315,25 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &422203621 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422203617} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1268,17 +1342,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &422203622 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422203617} + m_CullTransparentMesh: 0 --- !u!114 &422203623 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422203617} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1289,9 +1368,10 @@ MonoBehaviour: --- !u!1 &573735975 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 573735976} m_Layer: 5 @@ -1304,8 +1384,9 @@ GameObject: --- !u!224 &573735976 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573735975} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1325,9 +1406,10 @@ RectTransform: --- !u!1 &758649758 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 758649759} - component: {fileID: 758649761} @@ -1342,8 +1424,9 @@ GameObject: --- !u!224 &758649759 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 758649758} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1360,22 +1443,22 @@ RectTransform: --- !u!114 &758649760 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 758649758} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 89f43c36e5a5a495eab4b6c940c50a24, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1384,18 +1467,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &758649761 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 758649758} + m_CullTransparentMesh: 0 --- !u!1 &794353276 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 794353280} - component: {fileID: 794353279} @@ -1411,24 +1499,26 @@ GameObject: --- !u!114 &794353277 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794353276} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3} m_Name: m_EditorClassIdentifier: m_ForceModuleActive: 0 --- !u!114 &794353278 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794353276} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -1441,12 +1531,13 @@ MonoBehaviour: --- !u!114 &794353279 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794353276} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -1455,8 +1546,9 @@ MonoBehaviour: --- !u!4 &794353280 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 794353276} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1466,61 +1558,61 @@ Transform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &839471247 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 400000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 8200000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 8200000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: panLevelCustomCurve.m_RotationOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 8200000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} + - target: {fileID: 8200000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} propertyPath: reverbZoneMixCustomCurve.m_RotationOrder value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c8003baa1f5c64645a6884376b315d2a, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: c8003baa1f5c64645a6884376b315d2a, type: 3} --- !u!1 &867293036 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 867293037} - component: {fileID: 867293039} @@ -1535,8 +1627,9 @@ GameObject: --- !u!224 &867293037 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 867293036} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1553,22 +1646,22 @@ RectTransform: --- !u!114 &867293038 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 867293036} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 40 @@ -1586,15 +1679,18 @@ MonoBehaviour: --- !u!222 &867293039 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 867293036} + m_CullTransparentMesh: 0 --- !u!1 &968647766 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 968647767} - component: {fileID: 968647770} @@ -1610,8 +1706,9 @@ GameObject: --- !u!224 &968647767 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968647766} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1628,12 +1725,13 @@ RectTransform: --- !u!114 &968647768 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968647766} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1647,17 +1745,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 968647769} @@ -1675,27 +1776,25 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &968647769 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968647766} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 09142ba604abe48baa23ed14f7b5c486, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1704,18 +1803,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &968647770 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 968647766} + m_CullTransparentMesh: 0 --- !u!1 &1054722306 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1054722307} - component: {fileID: 1054722310} @@ -1731,9 +1836,10 @@ GameObject: --- !u!224 &1054722307 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054722306} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1750,13 +1856,14 @@ RectTransform: --- !u!114 &1054722308 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400066, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400066, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054722306} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} @@ -1765,23 +1872,23 @@ MonoBehaviour: --- !u!114 &1054722309 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054722306} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.24705882, g: 0.30980393, b: 0.3019608, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 59 @@ -1800,16 +1907,19 @@ MonoBehaviour: --- !u!222 &1054722310 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054722306} + m_CullTransparentMesh: 0 --- !u!1 &1165321415 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1165321416} - component: {fileID: 1165321418} @@ -1824,8 +1934,9 @@ GameObject: --- !u!224 &1165321416 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1165321415} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1842,22 +1953,22 @@ RectTransform: --- !u!114 &1165321417 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1165321415} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9490196, g: 0.9490196, b: 0.9490196, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 25 @@ -1875,15 +1986,18 @@ MonoBehaviour: --- !u!222 &1165321418 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1165321415} + m_CullTransparentMesh: 0 --- !u!1 &1197801492 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1197801493} m_Layer: 5 @@ -1896,8 +2010,9 @@ GameObject: --- !u!224 &1197801493 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1197801492} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1916,9 +2031,10 @@ RectTransform: --- !u!1 &1229553508 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1229553509} m_Layer: 5 @@ -1931,8 +2047,9 @@ GameObject: --- !u!224 &1229553509 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1229553508} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1951,9 +2068,10 @@ RectTransform: --- !u!1 &1250560570 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1250560571} - component: {fileID: 1250560574} @@ -1969,8 +2087,9 @@ GameObject: --- !u!224 &1250560571 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1250560570} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1988,12 +2107,13 @@ RectTransform: --- !u!114 &1250560572 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1250560570} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -2007,44 +2127,45 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1250560573} m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1250560573 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1250560570} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 39ab3736989834c31b51c79ab649ddf4, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2053,18 +2174,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1250560574 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1250560570} + m_CullTransparentMesh: 0 --- !u!1 &1423085396 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1423085397} - component: {fileID: 1423085399} @@ -2079,8 +2205,9 @@ GameObject: --- !u!224 &1423085397 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1423085396} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2097,22 +2224,22 @@ RectTransform: --- !u!114 &1423085398 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1423085396} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: db39daed5921c445c8cfa75e8de1dd34, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -2121,23 +2248,30 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1423085399 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1423085396} + m_CullTransparentMesh: 0 --- !u!1 &1451390727 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1451390728} - component: {fileID: 1451390731} - component: {fileID: 1451390730} - component: {fileID: 1451390729} + - component: {fileID: 1451390732} m_Layer: 5 m_Name: WordListText m_TagString: Untagged @@ -2148,9 +2282,10 @@ GameObject: --- !u!224 &1451390728 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1451390727} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2167,13 +2302,14 @@ RectTransform: --- !u!114 &1451390729 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400066, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400066, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1451390727} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} @@ -2182,23 +2318,23 @@ MonoBehaviour: --- !u!114 &1451390730 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1451390727} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.24705882, g: 0.30980393, b: 0.3019608, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 77f48c393ff474cc8ba260508813d4b7, type: 3} m_FontSize: 110 @@ -2218,16 +2354,32 @@ MonoBehaviour: --- !u!222 &1451390731 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451390727} + m_CullTransparentMesh: 0 +--- !u!114 &1451390732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1451390727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3030368a08460473fbf3a93d6e460de8, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 1451390730} --- !u!1 &1452095419 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1452095420} - component: {fileID: 1452095422} @@ -2242,8 +2394,9 @@ GameObject: --- !u!224 &1452095420 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452095419} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2260,22 +2413,22 @@ RectTransform: --- !u!114 &1452095421 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452095419} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 10dd0d2c20eb84d5fac816c60903a8f5, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2284,18 +2437,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1452095422 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452095419} + m_CullTransparentMesh: 0 --- !u!1 &1484499178 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1484499179} - component: {fileID: 1484499180} @@ -2309,8 +2467,9 @@ GameObject: --- !u!224 &1484499179 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484499178} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2328,12 +2487,13 @@ RectTransform: --- !u!114 &1484499180 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484499178} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -2351,9 +2511,10 @@ MonoBehaviour: --- !u!1 &1496830546 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1496830547} - component: {fileID: 1496830549} @@ -2368,8 +2529,9 @@ GameObject: --- !u!224 &1496830547 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496830546} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2386,22 +2548,22 @@ RectTransform: --- !u!114 &1496830548 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496830546} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.24705882, g: 0.30980393, b: 0.3019608, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 40 @@ -2419,15 +2581,19 @@ MonoBehaviour: --- !u!222 &1496830549 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496830546} + m_CullTransparentMesh: 0 --- !u!1 &1526871003 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1526871004} - component: {fileID: 1526871007} @@ -2443,9 +2609,10 @@ GameObject: --- !u!224 &1526871004 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526871003} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2462,13 +2629,14 @@ RectTransform: --- !u!114 &1526871005 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400066, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400066, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526871003} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} @@ -2477,23 +2645,23 @@ MonoBehaviour: --- !u!114 &1526871006 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526871003} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.24705882, g: 0.30980393, b: 0.3019608, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 60 @@ -2512,16 +2680,19 @@ MonoBehaviour: --- !u!222 &1526871007 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526871003} + m_CullTransparentMesh: 0 --- !u!1 &1743679753 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1743679754} - component: {fileID: 1743679757} @@ -2537,8 +2708,9 @@ GameObject: --- !u!224 &1743679754 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743679753} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2555,22 +2727,22 @@ RectTransform: --- !u!114 &1743679756 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743679753} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 @@ -2581,14 +2753,17 @@ MonoBehaviour: --- !u!222 &1743679757 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743679753} + m_CullTransparentMesh: 0 --- !u!114 &1743679758 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743679753} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2602,9 +2777,11 @@ MonoBehaviour: --- !u!1 &1753181845 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100050, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100050, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1753181846} - component: {fileID: 1753181851} @@ -2622,9 +2799,10 @@ GameObject: --- !u!224 &1753181846 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400050, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400050, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753181845} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2643,9 +2821,10 @@ RectTransform: Animator: serializedVersion: 3 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 9500002, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 9500002, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753181845} m_Enabled: 0 m_Avatar: {fileID: 0} @@ -2657,12 +2836,14 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!111 &1753181848 Animation: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11100002, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11100002, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753181845} m_Enabled: 0 serializedVersion: 3 @@ -2676,13 +2857,14 @@ Animation: --- !u!114 &1753181849 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400080, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400080, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753181845} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -2696,17 +2878,20 @@ MonoBehaviour: m_NormalColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.5019608} m_HighlightedColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.69803923} m_PressedColor: {r: 0.34509805, g: 0.34509805, b: 0.34509805, a: 0.69803923} + m_SelectedColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.69803923} m_DisabledColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.5019608} m_ColorMultiplier: 2 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1753181850} @@ -2724,28 +2909,26 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1753181850 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400082, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400082, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753181845} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + 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: 0} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2754,19 +2937,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1753181851 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200050, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200050, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753181845} + m_CullTransparentMesh: 0 --- !u!1 &1753836822 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1753836823} - component: {fileID: 1753836826} @@ -2782,8 +2970,9 @@ GameObject: --- !u!224 &1753836823 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753836822} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2803,12 +2992,13 @@ RectTransform: --- !u!114 &1753836824 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753836822} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -2822,17 +3012,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1753836825} @@ -2849,8 +3042,6 @@ MonoBehaviour: m_OnEndEdit: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnValueChanged: m_PersistentCalls: m_Calls: @@ -2865,8 +3056,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} @@ -2877,22 +3066,22 @@ MonoBehaviour: --- !u!114 &1753836825 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753836822} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 22d976510cc21481a9bd33383915c1dc, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2901,18 +3090,23 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1753836826 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753836822} + m_CullTransparentMesh: 0 --- !u!1 &1789740383 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1789740384} - component: {fileID: 1789740387} @@ -2928,8 +3122,9 @@ GameObject: --- !u!224 &1789740384 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789740383} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2947,12 +3142,13 @@ RectTransform: --- !u!114 &1789740385 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789740383} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -2966,44 +3162,45 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1789740386} m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &1789740386 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789740383} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: bc192b88da93946be9e122bcc2e7a480, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3012,18 +3209,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1789740387 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789740383} + m_CullTransparentMesh: 0 --- !u!1 &1810859128 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + type: 2} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1810859129} - component: {fileID: 1810859131} @@ -3038,9 +3241,10 @@ GameObject: --- !u!224 &1810859129 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22400042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1810859128} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3057,23 +3261,23 @@ RectTransform: --- !u!114 &1810859130 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 11400070, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1810859128} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.24705882, g: 0.30980393, b: 0.3019608, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 62b87bfdc119f420a8cc8e3a0a8f070b, type: 3} m_FontSize: 60 @@ -3091,16 +3295,19 @@ MonoBehaviour: --- !u!222 &1810859131 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, + m_CorrespondingSourceObject: {fileID: 22200042, guid: 9469c6210cbaf3b4f98cd473007e30a6, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1810859128} + m_CullTransparentMesh: 0 --- !u!1 &1885843548 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1885843549} - component: {fileID: 1885843551} @@ -3116,8 +3323,9 @@ GameObject: --- !u!224 &1885843549 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885843548} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3135,12 +3343,13 @@ RectTransform: --- !u!114 &1885843550 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885843548} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -3151,8 +3360,9 @@ MonoBehaviour: --- !u!223 &1885843551 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885843548} m_Enabled: 1 serializedVersion: 3 @@ -3171,12 +3381,13 @@ Canvas: --- !u!114 &1885843553 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1885843548} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -3190,73 +3401,73 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 --- !u!1001 &1895822044 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 125924, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 484928, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: m_audioClip value: objectReference: {fileID: 8300000, guid: 9bafa54cd13b49740bb783eba1ef25f1, type: 3} - - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: Loop value: 1 objectReference: {fileID: 0} - - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: panLevelCustomCurve.m_RotationOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} + - target: {fileID: 8280496, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} propertyPath: reverbZoneMixCustomCurve.m_RotationOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 125924, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 7d028e4fec77cab4e926e4b65414b360, type: 2} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: 7d028e4fec77cab4e926e4b65414b360, type: 3} --- !u!1 &1978296631 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1978296632} m_Layer: 5 @@ -3269,8 +3480,9 @@ GameObject: --- !u!224 &1978296632 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1978296631} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3287,9 +3499,10 @@ RectTransform: --- !u!1 &2063743866 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2063743867} m_Layer: 5 @@ -3302,8 +3515,9 @@ GameObject: --- !u!224 &2063743867 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063743866} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3322,11 +3536,13 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.49999994} --- !u!1 &2122682609 stripped GameObject: - m_PrefabParentObject: {fileID: 1655864962192918, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - m_PrefabInternal: {fileID: 81617893} + m_CorrespondingSourceObject: {fileID: 1655864962192918, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + m_PrefabInstance: {fileID: 81617893} + m_PrefabAsset: {fileID: 0} --- !u!224 &2122682610 stripped RectTransform: - m_PrefabParentObject: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, - type: 2} - m_PrefabInternal: {fileID: 81617893} + m_CorrespondingSourceObject: {fileID: 224896478763752036, guid: 412ef45fb77d34b8d866c6faf07b0cf7, + type: 3} + m_PrefabInstance: {fileID: 81617893} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/PopSignMain/Scenes/wordlist.unity b/Assets/PopSignMain/Scenes/wordlist.unity index daeeab8e..2a16302c 100644 --- a/Assets/PopSignMain/Scenes/wordlist.unity +++ b/Assets/PopSignMain/Scenes/wordlist.unity @@ -2014,6 +2014,7 @@ GameObject: - component: {fileID: 1451390731} - component: {fileID: 1451390730} - component: {fileID: 1451390729} + - component: {fileID: 1451390732} m_Layer: 5 m_Name: WordListText m_TagString: Untagged @@ -2102,6 +2103,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1451390727} m_CullTransparentMesh: 0 +--- !u!114 &1451390732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1451390727} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3030368a08460473fbf3a93d6e460de8, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 1451390730} --- !u!1 &1452095419 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs new file mode 100644 index 00000000..3836af5f --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; +using System.Text; + +public class changetitle : MonoBehaviour +{ + // Start is called before the first frame update + public UnityEngine.UI.Text text; + void Start() + { + + } + + // Update is called once per frame + void Update() + { + CustomizeLevelManager clm = CustomizeLevelManager.Instance; + string content = "Words Learned"; + + if (clm.tryingToCustomize == true) { + content = "Customize Level"; + } + text.text = content; + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs.meta new file mode 100644 index 00000000..79fe9ad1 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3030368a08460473fbf3a93d6e460de8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From e98d96d56b8e923dd14a5949743483729468d273 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Sun, 9 May 2021 15:05:15 -0400 Subject: [PATCH 08/24] declare dictionary --- .../Scripts/CustomizeLevelScript/CustomizeLevelManager.cs | 2 ++ .../WordListContentChangeOnWordSelection.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs index 995d2c0b..ae277875 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs @@ -7,6 +7,7 @@ public class CustomizeLevelManager : MonoBehaviour static public CustomizeLevelManager Instance; public bool tryingToCustomize = false; public HashSet selectedWord = new HashSet(); + public Dictionary> levels = new Dictionary>(); void Awake() { @@ -14,6 +15,7 @@ void Awake() { Instance = this; DontDestroyOnLoad(Instance); + // filter level files and population levels variable } } // Start is called before the first frame update diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs index 786b3d8b..2295fb4a 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs @@ -11,14 +11,14 @@ public class WordListContentChangeOnWordSelection : MonoBehaviour // Start is called before the first frame update void Start() { - text.text = "Tap any word to see its video. Select 5 words to create a custom practice level."; + text.text = "Tap any word to see its video. Select 3 to 5 words to create a custom practice level."; } // Update is called once per frame void Update() { CustomizeLevelManager clm = CustomizeLevelManager.Instance; - string content = "Tap any word to see its video. Select 5 words to create a custom practice level."; + string content = "Tap any word to see its video. Select 3 to 5 words to create a custom practice level."; if (clm != null) { HashSet set = clm.selectedWord; From 6ef251e0162e9734bb457561b53409ceced54de9 Mon Sep 17 00:00:00 2001 From: ConnorPeng Date: Sun, 9 May 2021 16:16:33 -0400 Subject: [PATCH 09/24] created_startbutton and things --- Assets/PopSignMain/Scenes/wordlist.unity | 213 ++++++++++++++++++ .../CustomizeLevelManager.cs | 25 +- .../CustomizeLevelScript/startbutton.cs | 22 ++ .../CustomizeLevelScript/startbutton.cs.meta | 11 + 4 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs.meta diff --git a/Assets/PopSignMain/Scenes/wordlist.unity b/Assets/PopSignMain/Scenes/wordlist.unity index 2a16302c..cc235cc3 100644 --- a/Assets/PopSignMain/Scenes/wordlist.unity +++ b/Assets/PopSignMain/Scenes/wordlist.unity @@ -612,6 +612,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 237249412} m_CullTransparentMesh: 0 +--- !u!1 &256927820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 256927821} + - component: {fileID: 256927824} + - component: {fileID: 256927823} + - component: {fileID: 256927822} + - component: {fileID: 256927825} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &256927821 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256927820} + 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: 1851958634} + m_Father: {fileID: 386362323} + 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} + m_AnchoredPosition: {x: -6.4, y: -624.33} + m_SizeDelta: {x: 393.96582, y: 92.24013} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &256927822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256927820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 256927823} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &256927823 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256927820} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c5dc00e30fd2e4742b80ac21aa78b5be, 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 &256927824 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256927820} + m_CullTransparentMesh: 0 +--- !u!114 &256927825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 256927820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa9f73f8e1aab4966ad52b6fb033a30a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &361183758 GameObject: m_ObjectHideFlags: 0 @@ -1006,6 +1138,7 @@ RectTransform: - {fileID: 1054722307} - {fileID: 1197801493} - {fileID: 1753836823} + - {fileID: 256927821} m_Father: {fileID: 127189972} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2940,6 +3073,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1810859128} m_CullTransparentMesh: 0 +--- !u!1 &1851958633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1851958634} + - component: {fileID: 1851958636} + - component: {fileID: 1851958635} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1851958634 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851958633} + 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: 256927821} + 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: -19} + m_SizeDelta: {x: 0, y: -11.22908} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1851958635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851958633} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Start Custom Level + +' +--- !u!222 &1851958636 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1851958633} + m_CullTransparentMesh: 0 --- !u!1 &1885843548 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs index ae277875..0577db6c 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs @@ -1,14 +1,36 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using System; public class CustomizeLevelManager : MonoBehaviour { static public CustomizeLevelManager Instance; public bool tryingToCustomize = false; public HashSet selectedWord = new HashSet(); - public Dictionary> levels = new Dictionary>(); + public Dictionary> levels = new Dictionary>(); + void readlevel() { + UnityEngine.Object[] level = Resources.LoadAll("Levels"); + foreach (UnityEngine.Object temp in level) { + TextAsset textAsset = (TextAsset)temp; + //Debug.Log(textAsset.text); + int index = textAsset.text.IndexOf("COLOR LIMIT"); + string numstr = textAsset.text.Substring(index + 12, 1); + Debug.Log(numstr); + int numlevel = Int32.Parse(numstr); + if (levels.ContainsKey(numlevel)) { + levels[numlevel].AddLast(textAsset); + } else { + LinkedList newlist = new LinkedList(); + newlist.AddLast(textAsset); + levels.Add(numlevel, newlist); + } + } + Debug.Log(levels.Keys); + Debug.Log(levels.Values); + } + void Awake() { if (Instance == null) @@ -16,6 +38,7 @@ void Awake() Instance = this; DontDestroyOnLoad(Instance); // filter level files and population levels variable + readlevel(); } } // Start is called before the first frame update diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs new file mode 100644 index 00000000..56c939e0 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class startbutton : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + if (CustomizeLevelManager.Instance.tryingToCustomize) { + this.gameObject.SetActive(true); + } else { + this.gameObject.SetActive(false); + } + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs.meta new file mode 100644 index 00000000..e03434b1 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fa9f73f8e1aab4966ad52b6fb033a30a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 32cdc6ee6af9ff023a76659f29f07f769a0e45ab Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 18:10:12 -0400 Subject: [PATCH 10/24] random pick a level layout --- Assets/PopSignMain/Scenes/wordlist.unity | 19 +++++++-- .../CustomizeLevelManager.cs | 5 +-- .../CustomizeLevelScript/changetitle.cs | 17 ++++---- .../CustomizeLevelScript/startbutton.cs | 39 ++++++++++++++++++- 4 files changed, 62 insertions(+), 18 deletions(-) diff --git a/Assets/PopSignMain/Scenes/wordlist.unity b/Assets/PopSignMain/Scenes/wordlist.unity index cc235cc3..a7c8d987 100644 --- a/Assets/PopSignMain/Scenes/wordlist.unity +++ b/Assets/PopSignMain/Scenes/wordlist.unity @@ -649,7 +649,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -6.4, y: -624.33} + m_AnchoredPosition: {x: -6.4, y: -700} m_SizeDelta: {x: 393.96582, y: 92.24013} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &256927822 @@ -694,7 +694,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 256927823} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 256927825} + m_MethodName: startCustomizedLevel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &256927823 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1317,7 +1328,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 39.563995, y: -250.7} - m_SizeDelta: {x: 600, y: 839.5} + m_SizeDelta: {x: 600, y: 775} m_Pivot: {x: 0.5584385, y: 0.5} --- !u!114 &422203619 MonoBehaviour: @@ -2358,7 +2369,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0005187988, y: 419.75} + m_AnchoredPosition: {x: 0.0005187988, y: 387.49994} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1484499180 diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs index 0577db6c..f0f96826 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs @@ -14,10 +14,8 @@ void readlevel() { UnityEngine.Object[] level = Resources.LoadAll("Levels"); foreach (UnityEngine.Object temp in level) { TextAsset textAsset = (TextAsset)temp; - //Debug.Log(textAsset.text); int index = textAsset.text.IndexOf("COLOR LIMIT"); string numstr = textAsset.text.Substring(index + 12, 1); - Debug.Log(numstr); int numlevel = Int32.Parse(numstr); if (levels.ContainsKey(numlevel)) { levels[numlevel].AddLast(textAsset); @@ -27,8 +25,7 @@ void readlevel() { levels.Add(numlevel, newlist); } } - Debug.Log(levels.Keys); - Debug.Log(levels.Values); + } void Awake() diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs index 3836af5f..0c7a575a 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs @@ -4,25 +4,26 @@ using System; using System.Text; -public class changetitle : MonoBehaviour +public class ChangeTitle : MonoBehaviour { // Start is called before the first frame update public UnityEngine.UI.Text text; void Start() { - + CustomizeLevelManager clm = CustomizeLevelManager.Instance; + string content = "Words Learned"; + + if (clm.tryingToCustomize == true) + { + content = "Customize Level"; + } + text.text = content; } // Update is called once per frame void Update() { - CustomizeLevelManager clm = CustomizeLevelManager.Instance; - string content = "Words Learned"; - if (clm.tryingToCustomize == true) { - content = "Customize Level"; - } - text.text = content; } } diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs index 56c939e0..f222feed 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs @@ -1,8 +1,9 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; -public class startbutton : MonoBehaviour +public class StartButton : MonoBehaviour { // Start is called before the first frame update void Start() @@ -19,4 +20,38 @@ void Update() { } + + // Click start buttom + public void startCustomizedLevel() + { + CustomizeLevelManager clm = CustomizeLevelManager.Instance; + if (clm == null) + { + return; + } + + int numOfWords = clm.selectedWord.Count; + if (numOfWords < 3 || numOfWords > 5) + { + return; + } + + LinkedList listOfLevelsToPick = clm.levels[numOfWords]; + if (listOfLevelsToPick == null || listOfLevelsToPick.Count < 1) + { + return; + } + + System.Random randomPicker = new System.Random(); + int randomUpperBound = listOfLevelsToPick.Count; + int randomIndex = randomPicker.Next(randomUpperBound); + TextAsset pickedLevel = null; + LinkedList.Enumerator enumerator = listOfLevelsToPick.GetEnumerator(); + for (int i = 1; i < randomIndex; i++) + { + enumerator.MoveNext(); + } + + pickedLevel = enumerator.Current; + } } From 711db0c9191e2ca2e73bb721682d1ccb3b58081e Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 19:21:07 -0400 Subject: [PATCH 11/24] create fake json file --- Assets/PopSignMain/Scripts/Core/LevelData.cs | 6 ++ .../PopSignMain/Scripts/Core/VideoManager.cs | 71 +++++++++++++++++++ .../CustomizeLevelScript/startbutton.cs | 12 ++++ 3 files changed, 89 insertions(+) diff --git a/Assets/PopSignMain/Scripts/Core/LevelData.cs b/Assets/PopSignMain/Scripts/Core/LevelData.cs index c0e703c9..f6a3b6b4 100644 --- a/Assets/PopSignMain/Scripts/Core/LevelData.cs +++ b/Assets/PopSignMain/Scripts/Core/LevelData.cs @@ -234,6 +234,12 @@ public static bool LoadLevel(int currentLevel) return true; } + public static bool loadLevelByTextAsset(TextAsset tx) + { + ProcesDataFromString(tx.text); + return true; + } + static void ProcesDataFromString(string mapText) { string[] lines = mapText.Split(new string[] { "\n" }, StringSplitOptions.RemoveEmptyEntries); diff --git a/Assets/PopSignMain/Scripts/Core/VideoManager.cs b/Assets/PopSignMain/Scripts/Core/VideoManager.cs index 8c553dbf..aed497e8 100644 --- a/Assets/PopSignMain/Scripts/Core/VideoManager.cs +++ b/Assets/PopSignMain/Scripts/Core/VideoManager.cs @@ -165,4 +165,75 @@ public void ChangeReviewVideo(string reviewWord) shouldChangeVideo = true; } + public static void loadCustomizedData() + { + if (sharedVideoManager == null) + { + resetVideoManager(); + } + + sharedVideoManager.videoList.Clear(); + + //start prepare fake json file + string fakeJsonTxt = "{\n"; + CustomizeLevelManager clm = CustomizeLevelManager.Instance; + if (clm == null) + { + return; + } + + HashSet selectedWords = clm.selectedWord; + int numOfWords = selectedWords.Count; + if (numOfWords < 3 || numOfWords > 5) + { + return; + } + + string allWords = (Resources.Load("words") as TextAsset).text; + for (int i = 0; i < numOfWords; i++) + { + string aWord = selectedWords.ToArray()[i]; + string color = ""; + switch(i) + { + case 0: + color = "blue"; + break; + case 1: + color = "green"; + break; + case 2: + color = "red"; + break; + case 3: + color = "violet"; + break; + case 4: + color = "yellow"; + break; + } + + string fileName = "\"" + color + "fileName\":\"" + aWord + "\",\n"; + string frameNumber = "\"" + color + "frameNumber\":"; + string folderName = "\"" + color + "folderName\":\"MacarthurBates/"; + string imageName = "\"" + color + "ImageName\":\"WordIcons/" + aWord + "\"" + (i + 1 == numOfWords? "\n}": ",\n"); + + int searchStartIndex = allWords.IndexOf(aWord) + aWord.Length; + string keySubstring = allWords.Substring(searchStartIndex); + int targetStartIndex = keySubstring.IndexOf("\"folderName\":\"") + "\"folderName\":\"".Length + " \"folderName\": \"".Length; + int targetEndIndex = keySubstring.IndexOf("\",", targetStartIndex); + folderName = folderName + keySubstring.Substring(targetStartIndex, targetEndIndex - targetStartIndex) + "/" + aWord + "\",\n"; + + searchStartIndex = targetEndIndex; + keySubstring = keySubstring.Substring(searchStartIndex); + targetStartIndex = keySubstring.IndexOf("\"frameNumber\":") + "\"frameNumber\":\"".Length; + targetEndIndex = keySubstring.IndexOf("},", targetStartIndex); + frameNumber = frameNumber + keySubstring.Substring(targetStartIndex, targetEndIndex - targetStartIndex - 5) + ",\n"; + + fakeJsonTxt = fakeJsonTxt + fileName + frameNumber + folderName + imageName; + } + Debug.Log(fakeJsonTxt); + //end prepare fake json file + } + } diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs index f222feed..356870b6 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs @@ -53,5 +53,17 @@ public void startCustomizedLevel() } pickedLevel = enumerator.Current; + enumerator.Dispose(); + if (pickedLevel == null) + { + return; + } + + //以下内容有可能出问题，可能会改动 + LevelData.loadLevelByTextAsset(pickedLevel); + VideoManager.loadCustomizedData(); + //以上内容有可能出问题，可能会改动 + + } } From 87ba6139a3fc868df64eb24916dfb7a6f5200185 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 19:40:33 -0400 Subject: [PATCH 12/24] start custom level --- .../Scripts/Core/AnimationManager.cs | 32 +++++++++++++++---- .../PopSignMain/Scripts/Core/VideoManager.cs | 22 ++++++++++++- .../CustomizeLevelManager.cs | 5 +++ .../CustomizeLevelScript/startbutton.cs | 2 ++ 4 files changed, 54 insertions(+), 7 deletions(-) diff --git a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs index 800a6413..3683d0ba 100644 --- a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs +++ b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs @@ -113,6 +113,7 @@ private void LogPlayTime() public void Play() { + Debug.Log(gameObject.name); SoundBase.Instance.GetComponent().PlayOneShot( SoundBase.Instance.click ); if( gameObject.name == "MenuGameOver" ) { @@ -128,8 +129,18 @@ public void Play() } else if( gameObject.name == "PracticeScreen" || gameObject.name == "MenuInGamePause" || gameObject.name == "Settings" ) { - SceneManager.LoadScene( "game" ); - VideoManager.resetVideoManager (); + if (gameObject.name == "MenuInGamePause" && CustomizeLevelManager.Instance.tryingToCustomize) + { + CustomizeLevelManager.reset(); + SceneManager.LoadScene("wordlist"); + } + else + { + SceneManager.LoadScene("game"); + VideoManager.resetVideoManager(); + } + + } else if( gameObject.name == "NextLevel") { @@ -140,10 +151,19 @@ public void Play() } else if( gameObject.name == "TryAgain") { - PlayerPrefs.SetInt("OpenLevel", PlayerPrefs.GetInt( "OpenLevel" )); - PlayerPrefs.Save(); - SceneManager.LoadScene("game"); - VideoManager.resetVideoManager (); + if (CustomizeLevelManager.Instance.tryingToCustomize) + { + CustomizeLevelManager.reset(); + SceneManager.LoadScene("wordlist"); + } + else + { + PlayerPrefs.SetInt("OpenLevel", PlayerPrefs.GetInt("OpenLevel")); + PlayerPrefs.Save(); + SceneManager.LoadScene("game"); + VideoManager.resetVideoManager(); + } + } else if( gameObject.name == "PlayMain" ) { diff --git a/Assets/PopSignMain/Scripts/Core/VideoManager.cs b/Assets/PopSignMain/Scripts/Core/VideoManager.cs index aed497e8..d297de3d 100644 --- a/Assets/PopSignMain/Scripts/Core/VideoManager.cs +++ b/Assets/PopSignMain/Scripts/Core/VideoManager.cs @@ -232,8 +232,28 @@ public static void loadCustomizedData() fakeJsonTxt = fakeJsonTxt + fileName + frameNumber + folderName + imageName; } - Debug.Log(fakeJsonTxt); //end prepare fake json file + + JsonData jd = JsonMapper.ToObject(fakeJsonTxt); + + foreach (BallColor color in Enum.GetValues(typeof(BallColor))) + { + if (color == BallColor.random) + { + break; + } + string fileName = jd[color + "fileName"] + ""; + sharedVideoManager.folderName = jd[color + "folderName"] + ""; + string frameNumber = jd[color + "frameNumber"] + ""; + string imageName = jd[color + "ImageName"] + ""; + if (fileName != "" && sharedVideoManager.folderName != "" && frameNumber != "" && imageName != "") + { + sharedVideoManager.videoList.Add(new Video(int.Parse(frameNumber), fileName, sharedVideoManager.folderName, imageName, color)); + } + } + sharedVideoManager.curtVideo = (Video)sharedVideoManager.videoList[0]; + sharedVideoManager.curtVideoIndex = 0; + } } diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs index f0f96826..1f164844 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs @@ -27,6 +27,11 @@ void readlevel() { } } + + public static void reset() + { + Instance.selectedWord = new HashSet(); + } void Awake() { diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs index 356870b6..7bf0ae28 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using UnityEngine.SceneManagement; using UnityEngine; public class StartButton : MonoBehaviour @@ -62,6 +63,7 @@ public void startCustomizedLevel() //以下内容有可能出问题，可能会改动 LevelData.loadLevelByTextAsset(pickedLevel); VideoManager.loadCustomizedData(); + SceneManager.LoadScene("game"); //以上内容有可能出问题，可能会改动 From a99668bcb472566723c85338904a1603cb6a6120 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 19:41:50 -0400 Subject: [PATCH 13/24] quit customize mode --- Assets/PopSignMain/Scripts/Core/AnimationManager.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs index 3683d0ba..380ecc3d 100644 --- a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs +++ b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs @@ -246,6 +246,10 @@ public void LoadMenu() public void Quit() { + if (CustomizeLevelManager.Instance.tryingToCustomize) + { + CustomizeLevelManager.Instance.tryingToCustomize = false; + } if( SceneManager.GetActiveScene().name == "game" ) SceneManager.LoadScene( "map" ); else From 6630f3e783a1e6dd2b8b471ddaf2706c1ec3d6a0 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 19:46:49 -0400 Subject: [PATCH 14/24] change restart button --- Assets/PopSignMain/Scenes/game.unity | 15 +++++++++++ .../RestartInCustomizeMode.cs | 26 +++++++++++++++++++ .../RestartInCustomizeMode.cs.meta | 11 ++++++++ 3 files changed, 52 insertions(+) create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs.meta diff --git a/Assets/PopSignMain/Scenes/game.unity b/Assets/PopSignMain/Scenes/game.unity index 0a92d9a4..452a5f53 100644 --- a/Assets/PopSignMain/Scenes/game.unity +++ b/Assets/PopSignMain/Scenes/game.unity @@ -4561,6 +4561,7 @@ MonoBehaviour: - {fileID: 0} arrows: {fileID: 519754614} newBall2: {fileID: 0} + BallWhiffed: 0 TargetCounter: 0 --- !u!82 &729910747 AudioSource: @@ -9969,6 +9970,7 @@ GameObject: - component: {fileID: 1889979851} - component: {fileID: 1889979850} - component: {fileID: 1889979849} + - component: {fileID: 1889979852} m_Layer: 5 m_Name: Restart m_TagString: Untagged @@ -10091,6 +10093,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1889979847} m_CullTransparentMesh: 0 +--- !u!114 &1889979852 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1889979847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 108025b02a43b874394135e28299ae72, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 751547381} --- !u!1 &1890438977 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs new file mode 100644 index 00000000..dc346c53 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RestartInCustomizeMode : MonoBehaviour +{ + public UnityEngine.UI.Text text; + // Start is called before the first frame update + void Start() + { + if (CustomizeLevelManager.Instance == null || !CustomizeLevelManager.Instance.tryingToCustomize) + { + text.text = "Restart"; + } + else + { + text.text = "Recreate"; + } + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs.meta new file mode 100644 index 00000000..415b15e5 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/RestartInCustomizeMode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 108025b02a43b874394135e28299ae72 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 66f5adaa28b0257dc60776b77929f5b002248663 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 19:54:35 -0400 Subject: [PATCH 15/24] on level complete menu --- Assets/PopSignMain/Scenes/game.unity | 16 +++++++++++- .../Scripts/Core/AnimationManager.cs | 18 ++++++++++--- .../CustomizeLevelManager.cs | 9 +++++++ .../NextLevelInCustomizeLevelMode.cs | 26 +++++++++++++++++++ .../NextLevelInCustomizeLevelMode.cs.meta | 11 ++++++++ 5 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs.meta diff --git a/Assets/PopSignMain/Scenes/game.unity b/Assets/PopSignMain/Scenes/game.unity index 452a5f53..cffeac05 100644 --- a/Assets/PopSignMain/Scenes/game.unity +++ b/Assets/PopSignMain/Scenes/game.unity @@ -539,7 +539,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &63144152 RectTransform: m_ObjectHideFlags: 0 @@ -10560,6 +10560,7 @@ GameObject: - component: {fileID: 1954909451} - component: {fileID: 1954909450} - component: {fileID: 1954909455} + - component: {fileID: 1954909456} m_Layer: 5 m_Name: NextLevel m_TagString: Untagged @@ -10732,6 +10733,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: PlayOnEnable: 0 +--- !u!114 &1954909456 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1954909448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1d02e114e46d9042a94c980e6094b1e, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 2041600503} --- !u!1 &1957547456 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs index 380ecc3d..0d5d19be 100644 --- a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs +++ b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs @@ -118,6 +118,7 @@ public void Play() if( gameObject.name == "MenuGameOver" ) { LogPlayTime (); + CustomizeLevelManager.switchOff(); SceneManager.LoadScene( "map" ); VideoManager.resetVideoManager (); if(PlayerPrefs.GetInt("AllLevelsCleared", 0) == 1 && PlayerPrefs.GetInt("CongratsModalShown", 0) == 0) @@ -144,10 +145,18 @@ public void Play() } else if( gameObject.name == "NextLevel") { - PlayerPrefs.SetInt("OpenLevel", PlayerPrefs.GetInt( "OpenLevel" ) + 1); - PlayerPrefs.Save(); - SceneManager.LoadScene("game"); - VideoManager.resetVideoManager (); + if (CustomizeLevelManager.Instance.tryingToCustomize) + { + CustomizeLevelManager.reset(); + SceneManager.LoadScene("wordlist"); + } + else + { + PlayerPrefs.SetInt("OpenLevel", PlayerPrefs.GetInt("OpenLevel") + 1); + PlayerPrefs.Save(); + SceneManager.LoadScene("game"); + VideoManager.resetVideoManager(); + } } else if( gameObject.name == "TryAgain") { @@ -167,6 +176,7 @@ public void Play() } else if( gameObject.name == "PlayMain" ) { + CustomizeLevelManager.switchOff(); SceneManager.LoadScene( "map" ); } } diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs index 1f164844..5df4b47f 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs @@ -32,6 +32,15 @@ public static void reset() { Instance.selectedWord = new HashSet(); } + + public static void switchOff() + { + if (Instance != null) + { + Instance.tryingToCustomize = false; + Instance.selectedWord = new HashSet(); + } + } void Awake() { diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs new file mode 100644 index 00000000..ea180a3a --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NextLevelInCustomizeLevelMode : MonoBehaviour +{ + public UnityEngine.UI.Text text; + // Start is called before the first frame update + void Start() + { + if (CustomizeLevelManager.Instance == null || !CustomizeLevelManager.Instance.tryingToCustomize) + { + text.text = "Next Level"; + } + else + { + text.text = "Recreate"; + } + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs.meta new file mode 100644 index 00000000..c4a72b43 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/NextLevelInCustomizeLevelMode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d1d02e114e46d9042a94c980e6094b1e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From ccf395ba61b93a5c6c3aa085a20cfa7301c0fe41 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 20:23:00 -0400 Subject: [PATCH 16/24] beta customize level --- Assets/PopSignMain/Scenes/game.unity | 2 +- .../Scripts/Core/AnimationManager.cs | 5 +-- Assets/PopSignMain/Scripts/Core/LevelData.cs | 4 +- .../CustomizeLevelManager.cs | 41 +++++++++++++++++++ .../TryAgainInCustomizeMode.cs | 18 ++++++++ .../TryAgainInCustomizeMode.cs.meta | 11 +++++ .../CustomizeLevelScript/startbutton.cs | 38 +---------------- 7 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs create mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta diff --git a/Assets/PopSignMain/Scenes/game.unity b/Assets/PopSignMain/Scenes/game.unity index cffeac05..35152a91 100644 --- a/Assets/PopSignMain/Scenes/game.unity +++ b/Assets/PopSignMain/Scenes/game.unity @@ -539,7 +539,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &63144152 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs index 0d5d19be..32310f67 100644 --- a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs +++ b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs @@ -162,8 +162,7 @@ public void Play() { if (CustomizeLevelManager.Instance.tryingToCustomize) { - CustomizeLevelManager.reset(); - SceneManager.LoadScene("wordlist"); + CustomizeLevelManager.startCustomizedLevel(); } else { @@ -258,7 +257,7 @@ public void Quit() { if (CustomizeLevelManager.Instance.tryingToCustomize) { - CustomizeLevelManager.Instance.tryingToCustomize = false; + CustomizeLevelManager.switchOff(); } if( SceneManager.GetActiveScene().name == "game" ) SceneManager.LoadScene( "map" ); diff --git a/Assets/PopSignMain/Scripts/Core/LevelData.cs b/Assets/PopSignMain/Scripts/Core/LevelData.cs index f6a3b6b4..5ac7ee7d 100644 --- a/Assets/PopSignMain/Scripts/Core/LevelData.cs +++ b/Assets/PopSignMain/Scripts/Core/LevelData.cs @@ -234,10 +234,10 @@ public static bool LoadLevel(int currentLevel) return true; } - public static bool loadLevelByTextAsset(TextAsset tx) + public static Target loadLevelByTextAsset(TextAsset tx) { ProcesDataFromString(tx.text); - return true; + return (Target)LevelData.mode; } static void ProcesDataFromString(string mapText) diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs index 5df4b47f..061500b9 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/CustomizeLevelManager.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using System; +using UnityEngine.SceneManagement; public class CustomizeLevelManager : MonoBehaviour { @@ -63,4 +64,44 @@ void Update() { } + + public static void startCustomizedLevel() + { + if (Instance == null || !Instance.tryingToCustomize) + { + return; + } + int numOfWords = Instance.selectedWord.Count; + if (numOfWords < 3 || numOfWords > 5) + { + return; + } + + Debug.Log(numOfWords); + + LinkedList listOfLevelsToPick = Instance.levels[numOfWords]; + if (listOfLevelsToPick == null || listOfLevelsToPick.Count < 1) + { + return; + } + + System.Random randomPicker = new System.Random(); + int randomUpperBound = listOfLevelsToPick.Count; + int randomIndex = randomPicker.Next(randomUpperBound); + TextAsset pickedLevel = null; + LinkedList.Enumerator enumerator = listOfLevelsToPick.GetEnumerator(); + for (int i = 1; i < randomIndex; i++) + { + enumerator.MoveNext(); + } + + pickedLevel = enumerator.Current; + if (pickedLevel == null) + { + return; + } + InitScriptName.InitScript.Instance.currentTarget = LevelData.loadLevelByTextAsset(pickedLevel); + VideoManager.loadCustomizedData(); + SceneManager.LoadScene("game"); + } } diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs new file mode 100644 index 00000000..35db1ac5 --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TryAgainInCustomizeMode : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta new file mode 100644 index 00000000..6188e07f --- /dev/null +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0fdae8162346d348b242250b3357a9f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs index 7bf0ae28..c8fe5c32 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs @@ -25,46 +25,10 @@ void Update() // Click start buttom public void startCustomizedLevel() { - CustomizeLevelManager clm = CustomizeLevelManager.Instance; - if (clm == null) - { - return; - } - - int numOfWords = clm.selectedWord.Count; - if (numOfWords < 3 || numOfWords > 5) - { - return; - } + CustomizeLevelManager.startCustomizedLevel(); - LinkedList listOfLevelsToPick = clm.levels[numOfWords]; - if (listOfLevelsToPick == null || listOfLevelsToPick.Count < 1) - { - return; - } - System.Random randomPicker = new System.Random(); - int randomUpperBound = listOfLevelsToPick.Count; - int randomIndex = randomPicker.Next(randomUpperBound); - TextAsset pickedLevel = null; - LinkedList.Enumerator enumerator = listOfLevelsToPick.GetEnumerator(); - for (int i = 1; i < randomIndex; i++) - { - enumerator.MoveNext(); - } - - pickedLevel = enumerator.Current; - enumerator.Dispose(); - if (pickedLevel == null) - { - return; - } - //以下内容有可能出问题，可能会改动 - LevelData.loadLevelByTextAsset(pickedLevel); - VideoManager.loadCustomizedData(); - SceneManager.LoadScene("game"); - //以上内容有可能出问题，可能会改动 } From 3225e76911afe05080f2ebc285dc010f6b47f467 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 20:39:12 -0400 Subject: [PATCH 17/24] delete useless file --- .../TryAgainInCustomizeMode.cs | 18 ------------------ .../TryAgainInCustomizeMode.cs.meta | 11 ----------- .../WordListContentChangeOnWordSelection.cs | 2 +- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs delete mode 100644 Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs deleted file mode 100644 index 35db1ac5..00000000 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class TryAgainInCustomizeMode : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta b/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta deleted file mode 100644 index 6188e07f..00000000 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/TryAgainInCustomizeMode.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f0fdae8162346d348b242250b3357a9f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs index 2295fb4a..460417a3 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs @@ -11,7 +11,7 @@ public class WordListContentChangeOnWordSelection : MonoBehaviour // Start is called before the first frame update void Start() { - text.text = "Tap any word to see its video. Select 3 to 5 words to create a custom practice level."; + text.text = "Tap any word to see its video. Select 5 words to create a custom practice level."; } // Update is called once per frame From ca02ec00a8c46390c0aaf10b58fac21d29ae870d Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Mon, 17 May 2021 20:42:14 -0400 Subject: [PATCH 18/24] remove duplicated string --- .../WordListContentChangeOnWordSelection.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs index 460417a3..14939790 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/WordListContentChangeOnWordSelection.cs @@ -8,17 +8,18 @@ public class WordListContentChangeOnWordSelection : MonoBehaviour { public UnityEngine.UI.Text text; + private static string textInCustomizedMode = "Tap any word to see its video. Select 5 words to create a custom practice level."; // Start is called before the first frame update void Start() { - text.text = "Tap any word to see its video. Select 5 words to create a custom practice level."; + text.text = textInCustomizedMode; } // Update is called once per frame void Update() { CustomizeLevelManager clm = CustomizeLevelManager.Instance; - string content = "Tap any word to see its video. Select 3 to 5 words to create a custom practice level."; + string content = textInCustomizedMode; if (clm != null) { HashSet set = clm.selectedWord; From a1016986a88fb26aa07ad15669d7323057edd585 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Tue, 18 May 2021 13:39:22 -0400 Subject: [PATCH 19/24] fix a small bug --- Assets/PopSignMain/Scripts/Core/AnimationManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs index b43ddb81..fe731ae6 100644 --- a/Assets/PopSignMain/Scripts/Core/AnimationManager.cs +++ b/Assets/PopSignMain/Scripts/Core/AnimationManager.cs @@ -225,7 +225,7 @@ public void CloseReview() { if (CustomizeLevelManager.Instance.tryingToCustomize) { - CustomizeLevelManager.Instance.tryingToCustomize = false; + CustomizeLevelManager.switchOff(); } SceneManager.LoadScene("map"); } From ab2679a1281860515fc053867f84244e14d73904 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Tue, 18 May 2021 13:40:11 -0400 Subject: [PATCH 20/24] set back the title --- .../Scripts/CustomizeLevelScript/changetitle.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs index 0c7a575a..5f51bd8b 100644 --- a/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs +++ b/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs @@ -10,6 +10,13 @@ public class ChangeTitle : MonoBehaviour public UnityEngine.UI.Text text; void Start() { + + } + + // Update is called once per frame + void Update() + { + CustomizeLevelManager clm = CustomizeLevelManager.Instance; string content = "Words Learned"; @@ -19,11 +26,4 @@ void Start() } text.text = content; } - - // Update is called once per frame - void Update() - { - - - } } From 3ecfca7b9acc7eacfc96d848c038e49f34959c05 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Tue, 18 May 2021 13:54:49 -0400 Subject: [PATCH 21/24] modify layout --- Assets/PopSignMain/Scenes/wordlist.unity | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/PopSignMain/Scenes/wordlist.unity b/Assets/PopSignMain/Scenes/wordlist.unity index a7c8d987..0c0f0df7 100644 --- a/Assets/PopSignMain/Scenes/wordlist.unity +++ b/Assets/PopSignMain/Scenes/wordlist.unity @@ -474,6 +474,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: PlayOnEnable: 1 + PRACTICE_LEVEL_INTERVAL: 5 --- !u!222 &127189977 CanvasRenderer: m_ObjectHideFlags: 0 @@ -649,7 +650,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -6.4, y: -700} + m_AnchoredPosition: {x: -6.4, y: -650} m_SizeDelta: {x: 393.96582, y: 92.24013} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &256927822 @@ -1328,7 +1329,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 39.563995, y: -250.7} - m_SizeDelta: {x: 600, y: 775} + m_SizeDelta: {x: 600, y: 700} m_Pivot: {x: 0.5584385, y: 0.5} --- !u!114 &422203619 MonoBehaviour: @@ -2369,7 +2370,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0005187988, y: 387.49994} + m_AnchoredPosition: {x: 0.0005187988, y: 274.7439} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1484499180 From 466e603fa04797e59ab6819f3327fc6280b8a9b9 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Tue, 18 May 2021 14:03:55 -0400 Subject: [PATCH 22/24] Rename startbutton.cs to StartButton.cs --- .../CustomizeLevelScript/{startbutton.cs => StartButton.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Assets/PopSignMain/Scripts/CustomizeLevelScript/{startbutton.cs => StartButton.cs} (100%) diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/StartButton.cs similarity index 100% rename from Assets/PopSignMain/Scripts/CustomizeLevelScript/startbutton.cs rename to Assets/PopSignMain/Scripts/CustomizeLevelScript/StartButton.cs From e13a5b1941aac4abf5f4dd570f901fd54784cb92 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Tue, 18 May 2021 14:04:16 -0400 Subject: [PATCH 23/24] Rename changetitle.cs to ChangeTitle.cs --- .../CustomizeLevelScript/{changetitle.cs => ChangeTitle.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Assets/PopSignMain/Scripts/CustomizeLevelScript/{changetitle.cs => ChangeTitle.cs} (100%) diff --git a/Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs b/Assets/PopSignMain/Scripts/CustomizeLevelScript/ChangeTitle.cs similarity index 100% rename from Assets/PopSignMain/Scripts/CustomizeLevelScript/changetitle.cs rename to Assets/PopSignMain/Scripts/CustomizeLevelScript/ChangeTitle.cs From 52837b79a179800ffd437cb500850684b5f5dc13 Mon Sep 17 00:00:00 2001 From: LechenDai43 <46640649+LechenDai43@users.noreply.github.com> Date: Tue, 18 May 2021 14:05:42 -0400 Subject: [PATCH 24/24] modify layout again --- Assets/PopSignMain/Scenes/wordlist.unity | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/PopSignMain/Scenes/wordlist.unity b/Assets/PopSignMain/Scenes/wordlist.unity index 0c0f0df7..7dab6864 100644 --- a/Assets/PopSignMain/Scenes/wordlist.unity +++ b/Assets/PopSignMain/Scenes/wordlist.unity @@ -1328,8 +1328,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 39.563995, y: -250.7} - m_SizeDelta: {x: 600, y: 700} + m_AnchoredPosition: {x: 39.563995, y: -175} + m_SizeDelta: {x: 600, y: 750} m_Pivot: {x: 0.5584385, y: 0.5} --- !u!114 &422203619 MonoBehaviour: @@ -2370,7 +2370,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0005187988, y: 274.7439} + m_AnchoredPosition: {x: 0.0005187988, y: 264.9776} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1484499180