diff --git a/Assets/OneShotOneKill.txt b/Assets/OneShotOneKill.txt new file mode 100644 index 0000000..27d10e0 --- /dev/null +++ b/Assets/OneShotOneKill.txt @@ -0,0 +1,2 @@ +테이블 만들기 +몬스터 만들기 \ No newline at end of file diff --git a/Assets/OneShotOneKill.txt.meta b/Assets/OneShotOneKill.txt.meta new file mode 100644 index 0000000..08e6b54 --- /dev/null +++ b/Assets/OneShotOneKill.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: befaed79dde51114d8720d677fb7795f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Prefab/Title_Loading.prefab b/Assets/ResWork/Prefab/Title_Loading.prefab index a55841d..fb9be54 100644 --- a/Assets/ResWork/Prefab/Title_Loading.prefab +++ b/Assets/ResWork/Prefab/Title_Loading.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 335153269965735115} - component: {fileID: 335153269965735117} - component: {fileID: 335153269965735116} - m_Layer: 0 + m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 335153271755698213} - 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} @@ -109,15 +108,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -146,7 +147,7 @@ GameObject: - component: {fileID: 335153270160055297} - component: {fileID: 335153270160055299} - component: {fileID: 335153270160055298} - m_Layer: 0 + m_Layer: 5 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -166,7 +167,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 335153271325487633} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -222,7 +222,7 @@ GameObject: - component: {fileID: 335153270443959039} - component: {fileID: 335153270443958977} - component: {fileID: 335153270443958976} - m_Layer: 0 + m_Layer: 5 m_Name: Bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -242,7 +242,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 335153271755698213} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -299,7 +298,7 @@ GameObject: - component: {fileID: 335153271325487636} - component: {fileID: 335153271325487635} - component: {fileID: 335153271325487634} - m_Layer: 0 + m_Layer: 5 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -320,7 +319,6 @@ RectTransform: m_Children: - {fileID: 335153270160055297} m_Father: {fileID: 335153271755698213} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -388,7 +386,7 @@ GameObject: m_Component: - component: {fileID: 335153271755698213} - component: {fileID: 335153271755698214} - m_Layer: 0 + m_Layer: 5 m_Name: Slider_Basic04_Orange m_TagString: Untagged m_Icon: {fileID: 0} @@ -411,7 +409,6 @@ RectTransform: - {fileID: 335153271325487633} - {fileID: 335153269965735115} m_Father: {fileID: 3534319327660164347} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -480,7 +477,7 @@ GameObject: - component: {fileID: 3534319326618396568} - component: {fileID: 3534319326618396566} - component: {fileID: 3534319326618396567} - m_Layer: 0 + m_Layer: 5 m_Name: ImageTitle m_TagString: Untagged m_Icon: {fileID: 0} @@ -500,7 +497,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3534319327660164347} - 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} @@ -557,7 +553,7 @@ GameObject: - component: {fileID: 3534319327004080006} - component: {fileID: 3534319327004080007} - component: {fileID: 3534319327004080005} - m_Layer: 0 + m_Layer: 5 m_Name: Loading m_TagString: Untagged m_Icon: {fileID: 0} @@ -578,7 +574,6 @@ RectTransform: m_Children: - {fileID: 3534319327921207661} m_Father: {fileID: 3534319327660164347} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -649,7 +644,7 @@ GameObject: - component: {fileID: 3534319327219377414} - component: {fileID: 3534319327219377412} - component: {fileID: 3534319327219377413} - m_Layer: 0 + m_Layer: 5 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -669,7 +664,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3534319327660164347} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -725,7 +719,7 @@ GameObject: - component: {fileID: 3534319327246893477} - component: {fileID: 3534319327246893475} - component: {fileID: 3534319327246893476} - m_Layer: 0 + m_Layer: 5 m_Name: Text_Ver m_TagString: Untagged m_Icon: {fileID: 0} @@ -745,7 +739,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3534319327660164347} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -823,15 +816,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -858,7 +853,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3534319327660164347} - m_Layer: 0 + - component: {fileID: 199882303419925502} + m_Layer: 5 m_Name: Title_Loading m_TagString: Untagged m_Icon: {fileID: 0} @@ -872,7 +868,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3534319327660164348} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -883,13 +879,27 @@ RectTransform: - {fileID: 335153271755698213} - {fileID: 3534319327246893477} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &199882303419925502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3534319327660164348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e47a4f68eb7764aa5a510bbdb216ce, type: 3} + m_Name: + m_EditorClassIdentifier: + label_version: {fileID: 3534319327246893476} + t_proc: {fileID: 335153269965735116} + slider_proc: {fileID: 335153271755698214} --- !u!1 &3534319327921207662 GameObject: m_ObjectHideFlags: 0 @@ -901,7 +911,7 @@ GameObject: - component: {fileID: 3534319327921207661} - component: {fileID: 3534319327921207659} - component: {fileID: 3534319327921207660} - m_Layer: 0 + m_Layer: 5 m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -921,7 +931,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3534319327004080008} - 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} diff --git a/Assets/ResWork/Prefab/Title_Login.prefab b/Assets/ResWork/Prefab/Title_Login.prefab index 8e2a603..5416616 100644 --- a/Assets/ResWork/Prefab/Title_Login.prefab +++ b/Assets/ResWork/Prefab/Title_Login.prefab @@ -12,7 +12,8 @@ GameObject: - component: {fileID: 5268405138841612932} - component: {fileID: 5268405138841612933} - component: {fileID: 5268405138841612986} - m_Layer: 0 + - component: {fileID: 8222011581677433762} + m_Layer: 5 m_Name: Button_Apple m_TagString: Untagged m_Icon: {fileID: 0} @@ -34,11 +35,10 @@ RectTransform: - {fileID: 5268405140453895640} - {fileID: 5268405139674727129} m_Father: {fileID: 5268405139837543361} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 325.05, y: -366.24} m_SizeDelta: {x: 650.1, y: 129.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5268405138841612932 @@ -94,6 +94,62 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0.2, a: 0.39215687} m_EffectDistance: {x: 0, y: -11} m_UseGraphicAlpha: 1 +--- !u!114 &8222011581677433762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268405138841612984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5268405138841612933} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2281556498065408954} + m_TargetAssemblyTypeName: TitleLoginUI, Assembly-CSharp + m_MethodName: OnClicl_Login + 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 &5268405138925621099 GameObject: m_ObjectHideFlags: 0 @@ -106,7 +162,8 @@ GameObject: - component: {fileID: 5268405138925621111} - component: {fileID: 5268405138925621108} - component: {fileID: 5268405138925621109} - m_Layer: 0 + - component: {fileID: 5899683483369229004} + m_Layer: 5 m_Name: Button_FaceBook m_TagString: Untagged m_Icon: {fileID: 0} @@ -128,11 +185,10 @@ RectTransform: - {fileID: 5268405139431319891} - {fileID: 5268405139578674765} m_Father: {fileID: 5268405139837543361} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 325.05, y: -215.57} m_SizeDelta: {x: 650.1, y: 129.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5268405138925621111 @@ -188,6 +244,62 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0.2, a: 0.39215687} m_EffectDistance: {x: 0, y: -11} m_UseGraphicAlpha: 1 +--- !u!114 &5899683483369229004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268405138925621099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5268405138925621108} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2281556498065408954} + m_TargetAssemblyTypeName: TitleLoginUI, Assembly-CSharp + m_MethodName: OnClicl_Login + 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 &5268405139211872190 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +311,7 @@ GameObject: - component: {fileID: 5268405139211872185} - component: {fileID: 5268405139211872187} - component: {fileID: 5268405139211872184} - m_Layer: 0 + m_Layer: 5 m_Name: Text_Ver m_TagString: Untagged m_Icon: {fileID: 0} @@ -219,7 +331,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405140209063686} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -297,15 +408,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -334,7 +447,7 @@ GameObject: - component: {fileID: 5268405139431319891} - component: {fileID: 5268405139431319901} - component: {fileID: 5268405139431319890} - m_Layer: 0 + m_Layer: 5 m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -354,7 +467,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405138925621098} - 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} @@ -410,7 +522,7 @@ GameObject: - component: {fileID: 5268405139556636751} - component: {fileID: 5268405139556636745} - component: {fileID: 5268405139556636750} - m_Layer: 0 + m_Layer: 5 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -430,7 +542,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405140209063686} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -486,7 +597,7 @@ GameObject: - component: {fileID: 5268405139578674765} - component: {fileID: 5268405139578674767} - component: {fileID: 5268405139578674764} - m_Layer: 0 + m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -506,7 +617,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405138925621098} - 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} @@ -584,15 +694,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -621,7 +733,7 @@ GameObject: - component: {fileID: 5268405139610875351} - component: {fileID: 5268405139610875345} - component: {fileID: 5268405139610875350} - m_Layer: 0 + m_Layer: 5 m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -641,7 +753,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405139774008196} - 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} @@ -697,7 +808,7 @@ GameObject: - component: {fileID: 5268405139674727129} - component: {fileID: 5268405139674727131} - component: {fileID: 5268405139674727128} - m_Layer: 0 + m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -717,7 +828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405138841612987} - 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} @@ -795,15 +905,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -833,7 +945,8 @@ GameObject: - component: {fileID: 5268405139694791022} - component: {fileID: 5268405139694791023} - component: {fileID: 5268405139694791020} - m_Layer: 0 + - component: {fileID: 6605689308656961753} + m_Layer: 5 m_Name: Button_Google m_TagString: Untagged m_Icon: {fileID: 0} @@ -855,11 +968,10 @@ RectTransform: - {fileID: 5268405139853498736} - {fileID: 5268405140836443885} m_Father: {fileID: 5268405139837543361} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 325.05, y: -64.899994} m_SizeDelta: {x: 650.1, y: 129.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5268405139694791022 @@ -915,6 +1027,62 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0.2, a: 0.39215687} m_EffectDistance: {x: 0, y: -11} m_UseGraphicAlpha: 1 +--- !u!114 &6605689308656961753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268405139694791010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5268405139694791023} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2281556498065408954} + m_TargetAssemblyTypeName: TitleLoginUI, Assembly-CSharp + m_MethodName: OnClicl_Login + 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 &5268405139774008197 GameObject: m_ObjectHideFlags: 0 @@ -927,7 +1095,8 @@ GameObject: - component: {fileID: 5268405139774008193} - component: {fileID: 5268405139774008198} - component: {fileID: 5268405139774008199} - m_Layer: 0 + - component: {fileID: 2260875519349962564} + m_Layer: 5 m_Name: Button_Email m_TagString: Untagged m_Icon: {fileID: 0} @@ -949,11 +1118,10 @@ RectTransform: - {fileID: 5268405139610875351} - {fileID: 5268405140820622628} m_Father: {fileID: 5268405139837543361} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 325.05, y: -516.91003} m_SizeDelta: {x: 650.1, y: 129.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5268405139774008193 @@ -1009,6 +1177,62 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0.2, a: 0.39215687} m_EffectDistance: {x: 0, y: -11} m_UseGraphicAlpha: 1 +--- !u!114 &2260875519349962564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268405139774008197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5268405139774008198} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2281556498065408954} + m_TargetAssemblyTypeName: TitleLoginUI, Assembly-CSharp + m_MethodName: OnClicl_Login + 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 &5268405139837543366 GameObject: m_ObjectHideFlags: 0 @@ -1019,7 +1243,7 @@ GameObject: m_Component: - component: {fileID: 5268405139837543361} - component: {fileID: 5268405139837543360} - m_Layer: 0 + m_Layer: 5 m_Name: Group_Buttons m_TagString: Untagged m_Icon: {fileID: 0} @@ -1043,7 +1267,6 @@ RectTransform: - {fileID: 5268405138841612987} - {fileID: 5268405139774008196} m_Father: {fileID: 5268405140209063686} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1087,7 +1310,7 @@ GameObject: - component: {fileID: 5268405139853498736} - component: {fileID: 5268405139853498738} - component: {fileID: 5268405139853498739} - m_Layer: 0 + m_Layer: 5 m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -1107,7 +1330,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405139694791021} - 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} @@ -1161,13 +1383,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5268405140209063686} - m_Layer: 0 + - component: {fileID: 2281556498065408954} + m_Layer: 5 m_Name: Title_Login m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5268405140209063686 RectTransform: m_ObjectHideFlags: 0 @@ -1175,7 +1398,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5268405140209063687} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1186,13 +1409,24 @@ RectTransform: - {fileID: 5268405140297781429} - {fileID: 5268405139211872185} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2281556498065408954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268405140209063687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 899e1ab26688c1a4da38fa3faab42c10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5268405140297781418 GameObject: m_ObjectHideFlags: 0 @@ -1204,7 +1438,7 @@ GameObject: - component: {fileID: 5268405140297781429} - component: {fileID: 5268405140297781431} - component: {fileID: 5268405140297781428} - m_Layer: 0 + m_Layer: 5 m_Name: Text_GuestLogin m_TagString: Untagged m_Icon: {fileID: 0} @@ -1224,7 +1458,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405140209063686} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1302,15 +1535,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1339,7 +1574,7 @@ GameObject: - component: {fileID: 5268405140453895640} - component: {fileID: 5268405140453895642} - component: {fileID: 5268405140453895643} - m_Layer: 0 + m_Layer: 5 m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} @@ -1359,7 +1594,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405138841612987} - 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} @@ -1415,7 +1649,7 @@ GameObject: - component: {fileID: 5268405140647883045} - component: {fileID: 5268405140647883047} - component: {fileID: 5268405140647883044} - m_Layer: 0 + m_Layer: 5 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -1435,7 +1669,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405140209063686} - 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} @@ -1491,7 +1724,7 @@ GameObject: - component: {fileID: 5268405140820622628} - component: {fileID: 5268405140820622630} - component: {fileID: 5268405140820622631} - m_Layer: 0 + m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1511,7 +1744,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405139774008196} - 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} @@ -1589,15 +1821,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1626,7 +1860,7 @@ GameObject: - component: {fileID: 5268405140836443885} - component: {fileID: 5268405140836443887} - component: {fileID: 5268405140836443884} - m_Layer: 0 + m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1646,7 +1880,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5268405139694791021} - 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} @@ -1724,15 +1957,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Assets/Resources/VersionCode.txt b/Assets/Resources/VersionCode.txt new file mode 100644 index 0000000..bf0d87a --- /dev/null +++ b/Assets/Resources/VersionCode.txt @@ -0,0 +1 @@ +4 \ No newline at end of file diff --git a/Assets/Resources/VersionCode.txt.meta b/Assets/Resources/VersionCode.txt.meta new file mode 100644 index 0000000..22c2897 --- /dev/null +++ b/Assets/Resources/VersionCode.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 373e6d8cc5d08c344aaaf7e1ef87f917 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SampleScene.unity b/Assets/SampleScene.unity index 52a19fe..7bb6dc3 100644 --- a/Assets/SampleScene.unity +++ b/Assets/SampleScene.unity @@ -17338,195 +17338,195 @@ PrefabInstance: m_Modifications: - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 84 objectReference: {fileID: 0} - target: {fileID: 351787396953488355, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -28 objectReference: {fileID: 0} - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 84 objectReference: {fileID: 0} - target: {fileID: 351787397989201312, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -124 objectReference: {fileID: 0} - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 719.25 objectReference: {fileID: 0} - target: {fileID: 1467771610490817847, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 171.25 objectReference: {fileID: 0} - target: {fileID: 2027362653857723309, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 376.75 objectReference: {fileID: 0} - target: {fileID: 2775089715950143664, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 993.25 objectReference: {fileID: 0} - target: {fileID: 3034941298722984408, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1061.75 objectReference: {fileID: 0} - target: {fileID: 3217378376239936541, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 924.75 objectReference: {fileID: 0} - target: {fileID: 3851091814487837347, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 74.985 objectReference: {fileID: 0} - target: {fileID: 4111377604873454816, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -738 objectReference: {fileID: 0} - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 74.985 objectReference: {fileID: 0} - target: {fileID: 4111377605057742992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -246 objectReference: {fileID: 0} - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 74.985 objectReference: {fileID: 0} - target: {fileID: 4111377605223402641, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -82 objectReference: {fileID: 0} - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 74.985 objectReference: {fileID: 0} - target: {fileID: 4111377605604120026, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -574 objectReference: {fileID: 0} - target: {fileID: 4111377606588400904, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_Pivot.x @@ -17612,197 +17612,201 @@ PrefabInstance: propertyPath: m_Name value: Play_Ingame objectReference: {fileID: 0} - - target: {fileID: 4111377606602774470, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} - propertyPath: m_AnchorMax.x + - target: {fileID: 4111377606588400911, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4111377606602774470, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + propertyPath: m_AnchorMax.x + value: 0.426 + objectReference: {fileID: 0} - target: {fileID: 4111377606602774470, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 74.985 objectReference: {fileID: 0} - target: {fileID: 4111377606646784701, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -410 objectReference: {fileID: 0} - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 445.25 objectReference: {fileID: 0} - target: {fileID: 4241219922751532992, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 513.75 objectReference: {fileID: 0} - target: {fileID: 4330008501081147663, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 34.25 objectReference: {fileID: 0} - target: {fileID: 5691718172133534467, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 582.25 objectReference: {fileID: 0} - target: {fileID: 5961969503056597898, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 308.25 objectReference: {fileID: 0} - target: {fileID: 6093049785316884920, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 787.75 objectReference: {fileID: 0} - target: {fileID: 6715526188961711891, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 102.75 objectReference: {fileID: 0} - target: {fileID: 7053290558194657676, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 7296985114498065767, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 0.426 objectReference: {fileID: 0} - target: {fileID: 7296985114498065767, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 856.25 objectReference: {fileID: 0} - target: {fileID: 8473443759915544516, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 650.75 objectReference: {fileID: 0} - target: {fileID: 8809062110974703447, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 239.75 objectReference: {fileID: 0} - target: {fileID: 9045579651515305713, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -25815,6 +25819,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105352134} m_CullTransparentMesh: 1 +--- !u!1 &105428496 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4111377606588400911, guid: 7a72290f58c260649a424bb4dd1d8726, type: 3} + m_PrefabInstance: {fileID: 73956442} + m_PrefabAsset: {fileID: 0} --- !u!1 &105455696 GameObject: m_ObjectHideFlags: 0 @@ -74250,6 +74259,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309246684} m_CullTransparentMesh: 1 +--- !u!1 &310300527 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6705501429885726023, guid: 66327ab08a675e74d91ab7c661fb0b4d, type: 3} + m_PrefabInstance: {fileID: 4552787061391130472} + m_PrefabAsset: {fileID: 0} --- !u!1 &310660917 GameObject: m_ObjectHideFlags: 0 @@ -82903,130 +82917,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1658679736} m_Modifications: - - target: {fileID: 5268405138841612984, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405138841612987, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405138841612987, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405138841612987, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.x - value: 325.05 - objectReference: {fileID: 0} - - target: {fileID: 5268405138841612987, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.y - value: -366.24 - objectReference: {fileID: 0} - - target: {fileID: 5268405138925621098, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405138925621098, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405138925621098, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.x - value: 325.05 - objectReference: {fileID: 0} - - target: {fileID: 5268405138925621098, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.y - value: -215.57 - objectReference: {fileID: 0} - - target: {fileID: 5268405138925621099, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139211872184, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - - target: {fileID: 5268405139211872190, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139431319888, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139556636748, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139578674754, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139578674764, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - - target: {fileID: 5268405139610875348, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139674727128, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - - target: {fileID: 5268405139674727134, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139694791010, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139694791021, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405139694791021, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405139694791021, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.x - value: 325.05 - objectReference: {fileID: 0} - - target: {fileID: 5268405139694791021, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.y - value: -64.9 - objectReference: {fileID: 0} - - target: {fileID: 5268405139774008196, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405139774008196, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5268405139774008196, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.x - value: 325.05 - objectReference: {fileID: 0} - - target: {fileID: 5268405139774008196, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_AnchoredPosition.y - value: -516.91003 - objectReference: {fileID: 0} - - target: {fileID: 5268405139774008197, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139837543366, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405139853498737, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5268405140209063686, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -83111,46 +83001,6 @@ PrefabInstance: propertyPath: m_Name value: Title_Login objectReference: {fileID: 0} - - target: {fileID: 5268405140209063687, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405140209063687, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5268405140297781418, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405140297781428, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - - target: {fileID: 5268405140453895641, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405140647883098, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405140820622629, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405140820622631, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - - target: {fileID: 5268405140836443874, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5268405140836443884, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -182207,6 +182057,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781182093} m_CullTransparentMesh: 1 +--- !u!1 &781736400 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5268405140209063687, guid: 1a8b517927c2e4442b7a250cc1fb5f49, type: 3} + m_PrefabInstance: {fileID: 351112745} + m_PrefabAsset: {fileID: 0} --- !u!1 &782317072 GameObject: m_ObjectHideFlags: 0 @@ -186076,18 +185931,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1658679736} m_Modifications: - - target: {fileID: 335153269965735114, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 335153269965735116, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - - target: {fileID: 335153270160055296, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 335153270160055297, guid: a5cc54f783de4de49827512b140bf187, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -186096,37 +185939,41 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 335153270443959038, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_Value + value: 1 objectReference: {fileID: 0} - - target: {fileID: 335153271325487632, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_MaxValue + value: 1 objectReference: {fileID: 0} - - target: {fileID: 335153271755698212, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3534319326618396569, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3534319327004080009, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1248297608} + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 objectReference: {fileID: 0} - - target: {fileID: 3534319327219377415, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnChange_SliderValue objectReference: {fileID: 0} - - target: {fileID: 3534319327246893476, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: TitleLoadingUI, Assembly-CSharp objectReference: {fileID: 0} - - target: {fileID: 3534319327246893478, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 335153271755698214, guid: a5cc54f783de4de49827512b140bf187, type: 3} + propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - target: {fileID: 3534319327660164347, guid: a5cc54f783de4de49827512b140bf187, type: 3} propertyPath: m_Pivot.x @@ -186212,18 +186059,6 @@ PrefabInstance: propertyPath: m_Name value: Title_Loading objectReference: {fileID: 0} - - target: {fileID: 3534319327660164348, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3534319327660164348, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3534319327921207662, guid: a5cc54f783de4de49827512b140bf187, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -214342,6 +214177,51 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &929836087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 929836089} + - component: {fileID: 929836088} + m_Layer: 0 + m_Name: Tables + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &929836088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929836087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c14fed3eb438f914cb3505f08e1677d4, type: 3} + m_Name: + m_EditorClassIdentifier: + go_child: {fileID: 0} +--- !u!4 &929836089 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929836087} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &929929637 GameObject: m_ObjectHideFlags: 0 @@ -284514,6 +284394,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1248238003} m_CullTransparentMesh: 1 +--- !u!1 &1248297607 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3534319327660164348, guid: a5cc54f783de4de49827512b140bf187, type: 3} + m_PrefabInstance: {fileID: 795870349} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1248297608 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 199882303419925502, guid: a5cc54f783de4de49827512b140bf187, type: 3} + m_PrefabInstance: {fileID: 795870349} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248297607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 33e47a4f68eb7764aa5a510bbdb216ce, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1248925532 GameObject: m_ObjectHideFlags: 0 @@ -294254,6 +294150,7 @@ GameObject: m_Component: - component: {fileID: 1293320786} - component: {fileID: 1293320785} + - component: {fileID: 1293320787} m_Layer: 0 m_Name: Mgr m_TagString: Untagged @@ -294292,6 +294189,19 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1293320787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1293320784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52152852f74654747acb5cc95bc2a766, type: 3} + m_Name: + m_EditorClassIdentifier: + go_child: {fileID: 0} --- !u!1 &1293420715 GameObject: m_ObjectHideFlags: 0 @@ -319606,6 +319516,11 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 1 +--- !u!1 &1404585889 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6646668980495317772, guid: cfaa484179ca79e4b99e57ae3f129682, type: 3} + m_PrefabInstance: {fileID: 8383393700860967785} + m_PrefabAsset: {fileID: 0} --- !u!1 &1404882172 GameObject: m_ObjectHideFlags: 0 @@ -331885,6 +331800,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1454824462} m_CullTransparentMesh: 1 +--- !u!1 &1454838785 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3870252441292929781, guid: 114e4b3312c28a44b8b5f060dcb7a01c, type: 3} + m_PrefabInstance: {fileID: 1094945843} + m_PrefabAsset: {fileID: 0} --- !u!1 &1455207078 GameObject: m_ObjectHideFlags: 0 @@ -356550,6 +356470,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1571370885} + - component: {fileID: 1571370886} - component: {fileID: 1571370884} - component: {fileID: 1571370883} - component: {fileID: 1571370882} @@ -356670,6 +356591,28 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1571370886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1571370880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63862245552169c4ba30e6ad9359a862, type: 3} + m_Name: + m_EditorClassIdentifier: + go_child: {fileID: 0} + m_UICamera: {fileID: 519420031} + gos: + - {fileID: 1248297607} + - {fileID: 781736400} + - {fileID: 1454838785} + - {fileID: 310300527} + - {fileID: 1404585889} + - {fileID: 105428496} + - {fileID: 2028811483} --- !u!1 &1571919064 GameObject: m_ObjectHideFlags: 0 @@ -467522,6 +467465,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2028463977} m_CullTransparentMesh: 1 +--- !u!1 &2028811483 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2463269072748575536, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} + m_PrefabInstance: {fileID: 194381319} + m_PrefabAsset: {fileID: 0} --- !u!1 &2029096761 GameObject: m_ObjectHideFlags: 0 @@ -495219,3 +495167,4 @@ SceneRoots: - {fileID: 1571370885} - {fileID: 11995857} - {fileID: 1293320786} + - {fileID: 929836089} diff --git a/Assets/Script/InGame/Actor/AimArrowController.cs b/Assets/Script/InGame/Actor/AimArrowController.cs index 3ef1a94..8a30dce 100644 --- a/Assets/Script/InGame/Actor/AimArrowController.cs +++ b/Assets/Script/InGame/Actor/AimArrowController.cs @@ -12,7 +12,6 @@ public class AimArrowController : MonoBehaviour void Start() { - Application.targetFrameRate = 60; arrow.enabled = false; } @@ -34,10 +33,7 @@ public class AimArrowController : MonoBehaviour arrow.enabled = false; isAiming = false; - var proj = ProjectileMgr.Ins.Get(); - proj.transform.position = arrow.transform.position; - proj.transform.rotation = arrow.transform.rotation; - proj.Set(); + ProjectileMgr.Ins.Get(arrow.transform).Set(); } void UpdateArrow(Vector2 currentPos) diff --git a/Assets/Script/InGame/Projectile/Projectile.cs b/Assets/Script/InGame/Projectile/Projectile.cs index 2aef31d..da05160 100644 --- a/Assets/Script/InGame/Projectile/Projectile.cs +++ b/Assets/Script/InGame/Projectile/Projectile.cs @@ -92,4 +92,16 @@ public class Projectile : MonoBehaviour // 위치 보정 transform.position = targetPos; } + + void Projectile_Split(bool hitEnemy) + { + if (hitEnemy) + { + for (int i = 0; i < 2; i++) + { + //ProjectileMgr.Ins.Get(transform.position, Quaternion.Euler(0, 0, Random.Range(-20, 20)) * dir); + } + } + + } } \ No newline at end of file diff --git a/Assets/Script/InGame/Projectile/ProjectileMgr.cs b/Assets/Script/InGame/Projectile/ProjectileMgr.cs index 09b72b9..c680817 100644 --- a/Assets/Script/InGame/Projectile/ProjectileMgr.cs +++ b/Assets/Script/InGame/Projectile/ProjectileMgr.cs @@ -26,10 +26,16 @@ public class ProjectileMgr : MonoBehaviourSingletonTemplate } } - public Projectile Get() + public Projectile Get(Transform tf) + { + return Get(tf.position, tf.rotation); + } + public Projectile Get(Vector3 pos, Quaternion q) { Projectile p = pool.Count > 0 ? pool.Dequeue() : CreateExtra(); p.gameObject.SetActive(true); + p.transform.position = pos; + p.transform.rotation = q; return p; } diff --git a/Assets/Script/Manager/Title_Mgr.cs b/Assets/Script/Manager/Title_Mgr.cs index 00eb7f4..d82e49c 100644 --- a/Assets/Script/Manager/Title_Mgr.cs +++ b/Assets/Script/Manager/Title_Mgr.cs @@ -17,15 +17,17 @@ public class Title_Mgr : MonoBehaviourSingletonTemplate while (!TableChecker.Ins.CheckAllLoad()) yield return null; // UI 아틀라스 로드 - yield return AddrResourceMgr.Ins.LoadObjectSequential("MainUI/UIAtlas.spriteatlas", atlas => { UIAtlasMgr.Ins.Set(atlas); }); + //yield return AddrResourceMgr.Ins.LoadObjectSequential("MainUI/UIAtlas.spriteatlas", atlas => { UIAtlasMgr.Ins.Set(atlas); }); + yield return new WaitForSeconds(0.1f); addslidevalue?.Invoke(0.1f); // OverUI (NetWait, Option 등) 로드 - yield return AddrResourceMgr.Ins.LoadObjectSequential("Title/OverUI.prefab", - go => - { - var overui = DSUtil.Get_Clone(go); - DontDestroyOnLoad(overui); - }); + //yield return AddrResourceMgr.Ins.LoadObjectSequential("Title/OverUI.prefab", + // go => + // { + // var overui = DSUtil.Get_Clone(go); + // DontDestroyOnLoad(overui); + // }); + yield return new WaitForSeconds(0.1f); addslidevalue?.Invoke(0.1f); } } \ No newline at end of file diff --git a/Assets/Script/UGUI/Common/GameUI.cs b/Assets/Script/UGUI/Common/GameUI.cs index f28d98c..5a134bc 100644 --- a/Assets/Script/UGUI/Common/GameUI.cs +++ b/Assets/Script/UGUI/Common/GameUI.cs @@ -3,23 +3,30 @@ using UnityEngine; public class GameUI : MonoBehaviourSingletonTemplate { public Camera m_UICamera; + public GameObject[] gos; // 0 Title_Loading, 1 Title_Login, 2 LobbyMain, 3 Tutorial_1, 4 Play_Stage_Select_1, + // 5 Play_Ingame, 6 Play_UI_ChoiceSkill + + private void Start() + { + Application.targetFrameRate = 60; + Screen.sleepTimeout = SleepTimeout.NeverSleep; // 게임 실행 중 화면 안 꺼지게 + Set_UI(0); + } private void Update() { if (Input.GetMouseButtonDown(0)) { - // 1️⃣ 마우스 위치(화면 좌표) Vector3 mousePos = Input.mousePosition; - - // 2️⃣ UI 카메라 기준의 월드 좌표로 변환 Vector3 worldPos = m_UICamera.ScreenToWorldPoint(mousePos); - - // 3️⃣ Z값 고정 (UI 평면 상) worldPos.z = 0f; - - // 4️⃣ 이펙트 생성 - //if (EffectMgr.Ins && EffectMgr.Ins.LoadComplete) + //if (EffectMgr.Ins && EffectMgr.Ins.LoadComplete) // 터치 이펙트 // EffectMgr.Ins.Show_Effect("TouchEffect", worldPos); } } + + public void Set_UI(int index) + { + DSUtil.InActivateGameObjects(gos, index); + } } \ No newline at end of file diff --git a/Assets/Script/UGUI/Title/TitleLoadingUI.cs b/Assets/Script/UGUI/Title/TitleLoadingUI.cs index 679b1c0..5c33109 100644 --- a/Assets/Script/UGUI/Title/TitleLoadingUI.cs +++ b/Assets/Script/UGUI/Title/TitleLoadingUI.cs @@ -17,85 +17,50 @@ using UnityEngine.Android; public class TitleLoadingUI : MonoBehaviour { - public TextMeshProUGUI label_version, label_msg, t_proc; + public TextMeshProUGUI label_version, t_proc; public Slider slider_proc; - public GameObject[] gos_LoginButton; // 애플(0) 구글(1) 게스트(2) - public GameObject go_InputID; - public TMP_InputField Input_ID; private IAppleAuthManager appleAuthManager; bool activeButtons, GoLogin, bServerComplete = false, bSreenTouch = false; int LoginFail = 0; float Proc_Value; - private void Awake() + private void OnEnable() { - Application.targetFrameRate = 60; - - go_InputID.SetActive(false); slider_proc.gameObject.SetActive(true); - slider_proc.value = Proc_Value = 0f; + slider_proc.value = 0f; + Proc_Value = 1f; t_proc.text = "0%"; InActive_LoginButton(); + StartCoroutine(Co_Start()); } - IEnumerator Start() + IEnumerator Co_Start() { ServerInfo.Ins.VersionCode = int.Parse(Resources.Load("VersionCode").text); label_version.text = DSUtil.Format("{0}({1})", Application.version, ServerInfo.Ins.VersionCode); - label_msg.text = ""; + //Add_ProcValue(0.1f); // 버전 로딩 10% slider_proc.value = 0f; // 테이블 로딩 기다리기 while (!TableChecker.Ins.CheckAllLoad()) yield return null; - Add_ProcValue(0.1f); // 테이블 로딩 10% + //Add_ProcValue(0.7f); // 테이블 로딩 70% - label_msg.text = table_localtext.Ins.Get_Text(1); - yield return StartCoroutine(Title_Mgr.Ins.Co_Check(Add_ProcValue)); + //yield return StartCoroutine(Title_Mgr.Ins.Co_Check(Add_ProcValue)); -#if !UNITY_EDITOR && UNITY_ANDROID && !FGB_OneStore - if (!Application.version.Equals("9.9.9")) - if (Application.installerName != "com.android.vending") - { - Popup.Ins.Set(ePopupType.One, 2, - () => { Application.OpenURL("market://details?id=" + Application.identifier); DSUtil.Quit(); }, - () => { Application.OpenURL("market://details?id=" + Application.identifier); DSUtil.Quit(); }); - yield break; - } -#endif -#if UNITY_ANDROID - if (!Permission.HasUserAuthorizedPermission("android.permission.POST_NOTIFICATIONS")) - Permission.RequestUserPermission("android.permission.POST_NOTIFICATIONS"); -#endif -#if !UNITY_EDITOR - // 파이어 베이스 초기화 - Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task => { - var dependencyStatus = task.Result; - if (dependencyStatus == Firebase.DependencyStatus.Available) - { - //FirebaseAnalytics.SetAnalyticsCollectionEnabled(true); - } - else - { - Debug.LogError(DSUtil.Format( "Could not resolve all Firebase dependencies: {0}", dependencyStatus)); - // Firebase Unity SDK is not safe to use here. - } - }); -#endif - - // 인앱 결제 정보 받아오기 - label_msg.text = table_localtext.Ins.Get_Text(3); - yield return new WaitForSeconds(0.1f); - Login(); + //Login(); } void Update() { if (Proc_Value > slider_proc.value) { - slider_proc.value += Time.deltaTime * 0.25f; + slider_proc.value += Time.deltaTime * 0.75f; if (Proc_Value <= slider_proc.value) slider_proc.value = Proc_Value; + + if (slider_proc.value >= 0.99f) + GameUI.Ins.Set_UI(1); } if (this.appleAuthManager != null) @@ -129,20 +94,18 @@ public class TitleLoadingUI : MonoBehaviour void Active_LoginButton() { - label_msg.text = table_localtext.Ins.Get_Text(3); - activeButtons = false; #if FGB_OneStore DSUtil.InActivateGameObjects(gos_LoginButton, 1); #else //DSUtil.ActivateGameObjects(gos_LoginButton); - DSUtil.InActivateGameObjects(gos_LoginButton, 2); // TODO 정인호 : 지금은 게스트만 + //DSUtil.InActivateGameObjects(gos_LoginButton, 2); // TODO 정인호 : 지금은 게스트만 #endif } void InActive_LoginButton() { activeButtons = false; - DSUtil.InActivateGameObjects(gos_LoginButton); + //DSUtil.InActivateGameObjects(gos_LoginButton); } void Login() @@ -171,9 +134,6 @@ public class TitleLoadingUI : MonoBehaviour } public void OnClick_DevLogin() { - label_msg.text = table_localtext.Ins.Get_Text(3); - go_InputID.SetActive(false); - ServerInfo.Ins.UserID = Input_ID.text; ServerInfo.Ins.Login(ServerComplete); } public void Login_SigninwithAppleID() @@ -325,8 +285,6 @@ public class TitleLoadingUI : MonoBehaviour void Set_OnClickScreen() { bSreenTouch = true; - label_msg.text = table_localtext.Ins.Get_Text(4); - label_msg.gameObject.AddComponent(); } public void OnClick_Screen() @@ -334,7 +292,6 @@ public class TitleLoadingUI : MonoBehaviour if (bSreenTouch) { //LoadingUI.Ins.Start_Loading(); - label_msg.text = ""; SceneManager.LoadScene("02_Game"); } } diff --git a/Assets/Script/UGUI/Title/TitleLoginUI.cs b/Assets/Script/UGUI/Title/TitleLoginUI.cs new file mode 100644 index 0000000..a7cbaae --- /dev/null +++ b/Assets/Script/UGUI/Title/TitleLoginUI.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +public class TitleLoginUI : MonoBehaviour +{ + public void OnClicl_Login() + { + GameUI.Ins.Set_UI(2); + } +} \ No newline at end of file diff --git a/Assets/Script/UGUI/Title/TitleLoginUI.cs.meta b/Assets/Script/UGUI/Title/TitleLoginUI.cs.meta new file mode 100644 index 0000000..7b38b26 --- /dev/null +++ b/Assets/Script/UGUI/Title/TitleLoginUI.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 899e1ab26688c1a4da38fa3faab42c10 \ No newline at end of file