diff --git a/Assets/Editor/Logs/NoItemLogs.txt b/Assets/Editor/Logs/NoItemLogs.txt index e69de29bb..b4e48bd9a 100644 --- a/Assets/Editor/Logs/NoItemLogs.txt +++ b/Assets/Editor/Logs/NoItemLogs.txt @@ -0,0 +1,48 @@ +2025-04-14 11:33:51 +Item ID 0 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at UIAtlasMgr.Get_Sprite (System.Int32 itemid) [0x00001] in C:\Git\nn_himminji\Assets\Script\Mgr\UIAtlasMgr.cs:19 + at MailCard.Set[T] (T _base) [0x0001a] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailCard.cs:16 + at uScrollViewMgr.Set_ScrollView[T] (System.Collections.Generic.List`1[T] _lst) [0x00013] in C:\Git\nn_himminji\Assets\Script\Util\uScrollViewMgr.cs:54 + at MailUI.Set_UI (SC_Mail mail) [0x0004b] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailUI.cs:32 + at MailUI.b__2_0 (SC_Mail mails) [0x00008] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailUI.cs:13 + at ServerInfo+<>c__DisplayClass55_0.b__0 (PlayFab.ClientModels.ExecuteCloudScriptResult result) [0x000dd] in C:\Git\nn_himminji\Assets\Script\Server\ServerInfo.cs:783 + at PlayFab.Internal.PlayFabHttp+<>c__DisplayClass23_0`1[TResult].<_MakeApiCall>b__1 () [0x0000f] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabHTTP.cs:219 + at PlayFab.Internal.PlayFabUnityHttp.OnResponse (System.String response, PlayFab.Internal.CallRequestContainer reqContainer) [0x000ba] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabUnityHttp.cs:237 + at PlayFab.Internal.PlayFabUnityHttp+d__12.MoveNext () [0x00256] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabUnityHttp.cs:189 + at UnityEngine.SetupCoroutine.InvokeMoveNext (System.Collections.IEnumerator enumerator, System.IntPtr returnValueAddress) [0x00000] in :0 + + +2025-04-14 11:33:51 +Item ID 0 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at UIAtlasMgr.Get_Sprite (System.Int32 itemid) [0x00001] in C:\Git\nn_himminji\Assets\Script\Mgr\UIAtlasMgr.cs:19 + at MailCard.Set[T] (T _base) [0x0001a] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailCard.cs:16 + at uScrollViewMgr.Set_ScrollView[T] (System.Collections.Generic.List`1[T] _lst) [0x00013] in C:\Git\nn_himminji\Assets\Script\Util\uScrollViewMgr.cs:54 + at MailUI.Set_UI (SC_Mail mail) [0x0004b] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailUI.cs:32 + at MailUI.b__2_0 (SC_Mail mails) [0x00008] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailUI.cs:13 + at ServerInfo+<>c__DisplayClass55_0.b__0 (PlayFab.ClientModels.ExecuteCloudScriptResult result) [0x000dd] in C:\Git\nn_himminji\Assets\Script\Server\ServerInfo.cs:783 + at PlayFab.Internal.PlayFabHttp+<>c__DisplayClass23_0`1[TResult].<_MakeApiCall>b__1 () [0x0000f] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabHTTP.cs:219 + at PlayFab.Internal.PlayFabUnityHttp.OnResponse (System.String response, PlayFab.Internal.CallRequestContainer reqContainer) [0x000ba] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabUnityHttp.cs:237 + at PlayFab.Internal.PlayFabUnityHttp+d__12.MoveNext () [0x00256] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabUnityHttp.cs:189 + at UnityEngine.SetupCoroutine.InvokeMoveNext (System.Collections.IEnumerator enumerator, System.IntPtr returnValueAddress) [0x00000] in :0 + + +2025-04-14 11:33:51 +Item ID 0 not found! + at System.Environment.get_StackTrace () [0x00000] in :0 + at table_itemlist.Get_Data (System.Int32 id) [0x00026] in C:\Git\nn_himminji\Assets\Script\Table\table_itemlist.cs:103 + at UIAtlasMgr.Get_Sprite (System.Int32 itemid) [0x00001] in C:\Git\nn_himminji\Assets\Script\Mgr\UIAtlasMgr.cs:19 + at MailCard.Set[T] (T _base) [0x0001a] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailCard.cs:16 + at uScrollViewMgr.Set_ScrollView[T] (System.Collections.Generic.List`1[T] _lst) [0x00013] in C:\Git\nn_himminji\Assets\Script\Util\uScrollViewMgr.cs:54 + at MailUI.Set_UI (SC_Mail mail) [0x0004b] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailUI.cs:32 + at MailUI.b__2_0 (SC_Mail mails) [0x00008] in C:\Git\nn_himminji\Assets\Script\UI\Center\Mail\MailUI.cs:13 + at ServerInfo+<>c__DisplayClass55_0.b__0 (PlayFab.ClientModels.ExecuteCloudScriptResult result) [0x000dd] in C:\Git\nn_himminji\Assets\Script\Server\ServerInfo.cs:783 + at PlayFab.Internal.PlayFabHttp+<>c__DisplayClass23_0`1[TResult].<_MakeApiCall>b__1 () [0x0000f] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabHTTP.cs:219 + at PlayFab.Internal.PlayFabUnityHttp.OnResponse (System.String response, PlayFab.Internal.CallRequestContainer reqContainer) [0x000ba] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabUnityHttp.cs:237 + at PlayFab.Internal.PlayFabUnityHttp+d__12.MoveNext () [0x00256] in C:\Git\nn_himminji\Assets\ThirdParty\PlayFabSDK\Shared\Internal\PlayFabHttp\PlayFabUnityHttp.cs:189 + at UnityEngine.SetupCoroutine.InvokeMoveNext (System.Collections.IEnumerator enumerator, System.IntPtr returnValueAddress) [0x00000] in :0 + + diff --git a/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab b/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab index a76df7f16..d031ab69d 100644 --- a/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab +++ b/Assets/ResWork/UIPrefabs/Mail/MailCard.prefab @@ -129,7 +129,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: -526.7643, w: -43.594284} + m_margin: {x: 0, y: 0, z: -392.9076, w: -43.594284} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -571,6 +571,141 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_localtextKey: 295 +--- !u!1 &5551512995814737102 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8764665176850011454} + - component: {fileID: 1372573233965898830} + - component: {fileID: 7868459370974003942} + m_Layer: 5 + m_Name: t_remnanttime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8764665176850011454 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551512995814737102} + 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: 1130181902522142026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 417, y: -31.1} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1372573233965898830 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551512995814737102} + m_CullTransparentMesh: 1 +--- !u!114 &7868459370974003942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551512995814737102} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uB0A8\uC740 \uC2DC\uAC04" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -392.9076, w: -43.594284} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5840162431427643664 GameObject: m_ObjectHideFlags: 0 @@ -580,6 +715,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1130181902522142026} + - component: {fileID: -2514396356274504821} m_Layer: 5 m_Name: MailCard m_TagString: Untagged @@ -602,6 +738,7 @@ RectTransform: - {fileID: 6672156520939304169} - {fileID: 4744237337038409599} - {fileID: 1635529047046532146} + - {fileID: 8764665176850011454} - {fileID: 8566261541286465253} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -610,6 +747,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 908, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &-2514396356274504821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840162431427643664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 522474fff30b9524b9c54015e8a6d82b, type: 3} + m_Name: + m_EditorClassIdentifier: + images: + - {fileID: 2948261333771316424} + texts: + - {fileID: 6207384885889463988} + - {fileID: 6781856732573250057} + - {fileID: 7868459370974003942} --- !u!1 &7694543748082418209 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index b8be21555..c6a791fea 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -11088,7 +11088,7 @@ GameObject: - component: {fileID: 5809321694354080930} - component: {fileID: 7649911212316755658} m_Layer: 5 - m_Name: Result + m_Name: Result_offchild m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -19079,7 +19079,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 8382031498026770910} + m_Father: {fileID: 8727812614589192527} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19578,7 +19578,7 @@ RectTransform: - {fileID: 8896736833878445470} - {fileID: 5488629597102189812} - {fileID: 4688487044667771458} - m_Father: {fileID: 8382031498026770910} + m_Father: {fileID: 8727812614589192527} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -39352,7 +39352,7 @@ RectTransform: m_Father: {fileID: 925291058961817483} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -47760,6 +47760,44 @@ MonoBehaviour: m_EditorClassIdentifier: gos: - {fileID: 4340292384020512647} +--- !u!1 &3543901906804978110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8727812614589192527} + m_Layer: 5 + m_Name: Child + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8727812614589192527 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3543901906804978110} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1720158996845802442} + - {fileID: 1297804775618525754} + - {fileID: 4000643441212365486} + m_Father: {fileID: 8382031498026770910} + 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!1 &3545117183302441702 GameObject: m_ObjectHideFlags: 0 @@ -49736,9 +49774,9 @@ RectTransform: - {fileID: 5070997152126263843} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 38.1, y: -38.26} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6794977624464831537 @@ -50459,7 +50497,7 @@ RectTransform: m_Father: {fileID: 3850105965408971949} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -56220,11 +56258,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9215642726506370053} + - {fileID: 6576628753252879149} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 252.56, y: -38.26} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6285734242704375772 @@ -57715,7 +57754,7 @@ RectTransform: m_Father: {fileID: 1406900139135982907} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.412, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -61751,9 +61790,9 @@ RectTransform: - {fileID: 8001933736921823976} m_Father: {fileID: 795777954291663711} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 145.32999, y: -38.26} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 76.2, y: 76.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4650173689224874701 @@ -63028,12 +63067,12 @@ GameObject: - component: {fileID: 8382031498026770910} - component: {fileID: 167911515820273903} m_Layer: 5 - m_Name: MailUI + m_Name: MailUI_offchild m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8382031498026770910 RectTransform: m_ObjectHideFlags: 0 @@ -63046,8 +63085,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1720158996845802442} - - {fileID: 1297804775618525754} + - {fileID: 8727812614589192527} m_Father: {fileID: 6291925347982253742} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -63070,7 +63108,9 @@ MonoBehaviour: m_ScrollRect: {fileID: 1291478846262530286} m_Content: {fileID: 0} go_card: {fileID: 5840162431427643664, guid: 28796a428911001489ac997bde9f4d9f, type: 3} - gos: [] + gos: + - {fileID: 3543901906804978110} + - {fileID: 6838253628446111123} --- !u!1 &4771111119931847208 GameObject: m_ObjectHideFlags: 0 @@ -66348,7 +66388,7 @@ GameObject: - component: {fileID: 5151745958176480095} - component: {fileID: 3077139404118749222} m_Layer: 5 - m_Name: Ranking + m_Name: Ranking_offchild m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -87567,6 +87607,155 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6838253628446111123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4000643441212365486} + - component: {fileID: 2171995347049690872} + - component: {fileID: 3785621360168367684} + - component: {fileID: 6286170977915543131} + m_Layer: 5 + m_Name: nomail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4000643441212365486 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253628446111123} + 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: 8727812614589192527} + 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: 0} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2171995347049690872 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253628446111123} + m_CullTransparentMesh: 1 +--- !u!114 &3785621360168367684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253628446111123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC6B0\uD3B8\uC774 \uC5C6\uC2B5\uB2C8\uB2E4." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 40 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &6286170977915543131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6838253628446111123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2aa95ff1b7adc044bd9372cf2958828, type: 3} + m_Name: + m_EditorClassIdentifier: + m_localtextKey: 147 --- !u!1 &6840230163416838402 GameObject: m_ObjectHideFlags: 0 @@ -97471,7 +97660,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8541309915134075684 RectTransform: m_ObjectHideFlags: 0 @@ -114230,6 +114419,8 @@ MonoBehaviour: - {fileID: 6298789519930308833} m_MissionUI: {fileID: 5743882714988958725} m_BuffADUI: {fileID: 7927918590583056939} + gos_noti: + - {fileID: 3786295824972111576} --- !u!223 &7830712477181563274 Canvas: m_ObjectHideFlags: 0 @@ -127156,6 +127347,136 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1865486864556095626} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1871179714943227145 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2982712285084103523} + m_Modifications: + - target: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_Name + value: Noti_mail + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_SizeDelta.x + value: 21 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -10.5 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a00dadd9f440a9140a4635e892b7d8c3, type: 3} +--- !u!1 &3786295824972111576 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3277595734800223185, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + m_PrefabInstance: {fileID: 1871179714943227145} + m_PrefabAsset: {fileID: 0} +--- !u!224 &6576628753252879149 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4806225947338055204, guid: a00dadd9f440a9140a4635e892b7d8c3, + type: 3} + m_PrefabInstance: {fileID: 1871179714943227145} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1892543745282148411 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 9fc428a29..bd6d3cce9 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -1,8 +1,7 @@ +using CodeStage.AntiCheat.ObscuredTypes; using System; using System.Collections.Generic; using System.Linq; -using System.Security.Cryptography; -using CodeStage.AntiCheat.ObscuredTypes; using UnityEngine; #region 게임 최초 실행 시 서버 정보 @@ -24,11 +23,10 @@ public class SC_Mail { public List Mail; } [Serializable] public class ServerMailData { - public string Msg, Reward, RemainTime; + public string Msg, RemainTime; public double RewardAmount; public int ID, IsShopItem; - public eItem Item; public DateTime RemnantTime; } #endregion diff --git a/Assets/Script/Server/ServerInfo.cs b/Assets/Script/Server/ServerInfo.cs index d831b38f5..17a04671a 100644 --- a/Assets/Script/Server/ServerInfo.cs +++ b/Assets/Script/Server/ServerInfo.cs @@ -752,6 +752,7 @@ public class ServerInfo : MyCoroutine #region 우편 public void Get_MailList(bool _netwait, Action _act) { + if (NewGameUI.isIns) NewGameUI.Ins.gos_noti[0].SetActive(false); NetWait.Ins.Set(_netwait); PlayFabClientAPI.ExecuteCloudScript(new ExecuteCloudScriptRequest { @@ -775,12 +776,12 @@ public class ServerInfo : MyCoroutine { for (int i = 0; i < maildata.Mail.Count; i++) { - maildata.Mail[i].Item = DSUtil.StringToEnum(maildata.Mail[i].Reward); DateTime.TryParse(maildata.Mail[i].RemainTime, out maildata.Mail[i].RemnantTime); } - maildata.Mail.RemoveAll(f => (f.RemnantTime - ServerTime).TotalSeconds < 0 || f.Item == eItem.None); // 시간 지난 우편 정리 + maildata.Mail.RemoveAll(f => (f.RemnantTime - ServerTime).TotalSeconds < 0); // 시간 지난 우편 정리 _act?.Invoke(maildata); + if (NewGameUI.isIns) NewGameUI.Ins.gos_noti[0].SetActive(maildata.Mail.Count > 0); } else _act?.Invoke(null); diff --git a/Assets/Script/Table/table_shop.cs b/Assets/Script/Table/table_shop.cs index 720e11284..c54f9490b 100644 --- a/Assets/Script/Table/table_shop.cs +++ b/Assets/Script/Table/table_shop.cs @@ -106,7 +106,7 @@ public class table_shop : MonoBehaviour void BuyNext(Action _act) { - GameUI.Ins.LobbyUI.Set_MailNoti(true); + NewGameUI.Ins.gos_noti[0].SetActive(true); MyText.Show_CheckMailBox(); _act?.Invoke(); } diff --git a/Assets/Script/UI/Center/Mail/MailCard.cs b/Assets/Script/UI/Center/Mail/MailCard.cs index df00da10e..c2a6357b0 100644 --- a/Assets/Script/UI/Center/Mail/MailCard.cs +++ b/Assets/Script/UI/Center/Mail/MailCard.cs @@ -22,7 +22,6 @@ public class MailCard : CardBase public void OnClick_GetReward() { - var item = m_ServerMailData.Item; var id = m_ServerMailData.ID; var amount = m_ServerMailData.RewardAmount; var isShopItem = m_ServerMailData.IsShopItem > 0; @@ -38,21 +37,13 @@ public class MailCard : CardBase ToastUI.Ins.Set(144); break; default: - var obtainlst = sinfo.m_ServerData.Add_Item(new ItemData(item, id, amount, "mail", eUICardType.GetItem)); - if (isShopItem) - { - var shopdata = table_shop.Ins.Get_Data(item, id); - if (shopdata != null) - obtainlst.AddRange(sinfo.m_ServerData.Add_Item(new ItemData(eItem.mClover, 0, shopdata.Mileage, DSUtil.Format("shop {0} {1}", item, id), eUICardType.GetItem))); - } - if (obtainlst.Count > 0) GetItemUI.Ins.Set(obtainlst); + sinfo.m_ServerData.Add_Item(id, amount); sinfo.Write(() => { - if (obtainlst.Count > 0) GetItemUI.Ins.Show_Items(); }); break; } - //GameUI.Ins.LobbyUI.Get_MailUI().Del_Mail(m_ServerMailData); + MailUI.Ins.Del_Mail(m_ServerMailData); }); } } \ No newline at end of file diff --git a/Assets/Script/UI/Center/Mail/MailUI.cs b/Assets/Script/UI/Center/Mail/MailUI.cs index 8855e8b8b..4870d2ea7 100644 --- a/Assets/Script/UI/Center/Mail/MailUI.cs +++ b/Assets/Script/UI/Center/Mail/MailUI.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using UnityEngine; -public class MailUI : uScrollViewMgr +public class MailUI : MonoBehaviourSingletonuScrollViewMgr { - public GameObject[] gos; // 0 우편없음 + public GameObject[] gos; // 0 child, 1 우편없음 SC_Mail MailData; @@ -15,7 +15,7 @@ public class MailUI : uScrollViewMgr { base.Set(); CardBase_AllOff(); - gos[0].SetActive(true); + DSUtil.ActivateGameObjects(gos); } } @@ -24,13 +24,11 @@ public class MailUI : uScrollViewMgr if (mail == null || mail.Mail == null || mail.Mail.Count == 0) { CardBase_AllOff(); - gos[0].SetActive(true); - GameUI.Ins.LobbyUI.Set_MailNoti(false); + gos[1].SetActive(true); } else { - gos[0].SetActive(false); - GameUI.Ins.LobbyUI.Set_MailNoti(true); + gos[1].SetActive(false); Set_ScrollView(mail.Mail); } } @@ -55,13 +53,13 @@ public class MailUI : uScrollViewMgr var temp = MailData.Mail.Find(f => DateTime.Compare(f.RemnantTime, mail.Mail[i].RemnantTime) == 0); if (temp != null) { - obtainlist.AddRange(sdata.Add_Item(new ItemData(temp.Item, temp.ID, temp.RewardAmount, "Mail", eUICardType.GetItem))); - if (temp.IsShopItem > 0) - { - var shopdata = table_shop.Ins.Get_Data(temp.Item, temp.ID); - if (shopdata != null) - obtainlist.AddRange(sdata.Add_Item(new ItemData(eItem.mClover, 0, shopdata.Mileage, DSUtil.Format("shop {0} {1}", temp.Item, temp.ID), eUICardType.GetItem))); - } + //obtainlist.AddRange(sdata.Add_Item(new ItemData(temp.Item, temp.ID, temp.RewardAmount, "Mail", eUICardType.GetItem))); + //if (temp.IsShopItem > 0) + //{ + // var shopdata = table_shop.Ins.Get_Data(temp.Item, temp.ID); + // if (shopdata != null) + // obtainlist.AddRange(sdata.Add_Item(new ItemData(eItem.mClover, 0, shopdata.Mileage, DSUtil.Format("shop {0} {1}", temp.Item, temp.ID), eUICardType.GetItem))); + //} } } @@ -78,6 +76,6 @@ public class MailUI : uScrollViewMgr public override void OnClick_Back() { base.OnClick_Back(); - GameUI.Ins.LobbyUI.Set_Noti(); + NewGameUI.Ins.gos_noti[0].SetActive(MailData != null && MailData.Mail.Count > 0); } } \ No newline at end of file diff --git a/Assets/Script/UI/GameUI.cs b/Assets/Script/UI/GameUI.cs index 19615cfc7..cc23d606f 100644 --- a/Assets/Script/UI/GameUI.cs +++ b/Assets/Script/UI/GameUI.cs @@ -72,7 +72,6 @@ public class Lobby_Bundle // 받을 수 있는 출석부 보상이 있을 때 gos_noti[19].SetActive(sdata.Get_Common(eCommon.AttendanceStep) < 15 && sdata.Get_Common(eCommon.AttendanceDOY) != ServerInfo.ServerTime.DayOfYear); } - public void Set_MailNoti(bool _active) { gos_noti[8].SetActive(_active); gos_noti[14].SetActive(_active); gos_noti[17].SetActive(_active); } public void Set_Label(UIMenu _menu) { arr_Menu[MyEnumToInt.Ins.Get_Int(_menu)].Set_Label(); } public void OnClick_Button(GameObject _go) { diff --git a/Assets/Script/UI/NewGameUI.cs b/Assets/Script/UI/NewGameUI.cs index ab44f0649..60701309e 100644 --- a/Assets/Script/UI/NewGameUI.cs +++ b/Assets/Script/UI/NewGameUI.cs @@ -22,6 +22,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate public BotMenuBase[] FarmMenu; public MissionUI m_MissionUI; public BuffADUI m_BuffADUI; + public GameObject[] gos_noti; // 0 우편 bool ShowQuick = true; @@ -32,6 +33,8 @@ public class NewGameUI : MonoBehaviourSingletonTemplate InGameInfo.Ins.Load_Map(-1); var cameraData = Camera.main.GetUniversalAdditionalCameraData(); cameraData.cameraStack.Add(UICamera); + + MailUI.Ins.Set(true); } #if UNITY_EDITOR