diff --git a/Assets/Editor/Logs/NoItemLogs.txt b/Assets/Editor/Logs/NoItemLogs.txt index b4e48bd9a..e69de29bb 100644 --- a/Assets/Editor/Logs/NoItemLogs.txt +++ b/Assets/Editor/Logs/NoItemLogs.txt @@ -1,48 +0,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 - - -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/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index 5d8b4d566..586e7f96e 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index c6a791fea..66e6d7961 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -19168,9 +19168,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 4760461359040582243} - m_TargetAssemblyTypeName: BackKeyAdd, Assembly-CSharp - m_MethodName: + - m_Target: {fileID: 167911515820273903} + m_TargetAssemblyTypeName: MailUI, Assembly-CSharp + m_MethodName: OnClick_Back m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -116547,13 +116547,13 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 + - m_Target: {fileID: 7427148544070994456} + m_TargetAssemblyTypeName: NewGameUI, Assembly-CSharp + m_MethodName: OnClick_Button + m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgument: {fileID: 8916775941184843946} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index bd6d3cce9..a99573744 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -24,8 +24,7 @@ public class SC_Mail { public List Mail; } public class ServerMailData { public string Msg, RemainTime; - public double RewardAmount; - public int ID, IsShopItem; + public int ItemID, Amount; public DateTime RemnantTime; } diff --git a/Assets/Script/UI/Center/Mail/MailCard.cs b/Assets/Script/UI/Center/Mail/MailCard.cs index c2a6357b0..a5df1264a 100644 --- a/Assets/Script/UI/Center/Mail/MailCard.cs +++ b/Assets/Script/UI/Center/Mail/MailCard.cs @@ -13,19 +13,18 @@ public class MailCard : CardBase base.Set(_base); m_ServerMailData = _base as ServerMailData; - images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_ServerMailData.ID); - var ts = m_ServerMailData.RemnantTime - ServerInfo.ServerTime; - if (ts.TotalDays < 1) texts[0].text = DSUtil.Format(145, ts.Hours, ts.Minutes); - else texts[0].text = DSUtil.Format(146, (int)ts.TotalDays); + images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_ServerMailData.ItemID); + texts[0].text = m_ServerMailData.Amount.ToString(); texts[1].text = m_ServerMailData.Msg; + var ts = m_ServerMailData.RemnantTime - ServerInfo.ServerTime; + if (ts.TotalDays < 1) texts[2].text = DSUtil.Format(145, ts.Hours, ts.Minutes); + else texts[2].text = DSUtil.Format(146, (int)ts.TotalDays); } public void OnClick_GetReward() { - var id = m_ServerMailData.ID; - var amount = m_ServerMailData.RewardAmount; - var isShopItem = m_ServerMailData.IsShopItem > 0; - + var id = m_ServerMailData.ItemID; + var amount = m_ServerMailData.Amount; var sinfo = ServerInfo.Ins; sinfo.Get_MailReward(m_ServerMailData.RemainTime, diff --git a/Assets/Script/UI/Center/Mail/MailUI.cs b/Assets/Script/UI/Center/Mail/MailUI.cs index 4870d2ea7..f94f85d63 100644 --- a/Assets/Script/UI/Center/Mail/MailUI.cs +++ b/Assets/Script/UI/Center/Mail/MailUI.cs @@ -75,7 +75,8 @@ public class MailUI : MonoBehaviourSingletonuScrollViewMgr public override void OnClick_Back() { - base.OnClick_Back(); + Del_BackKey(); + DSUtil.InActivateGameObjects(gos); NewGameUI.Ins.gos_noti[0].SetActive(MailData != null && MailData.Mail.Count > 0); } } \ No newline at end of file diff --git a/Assets/Script/UI/NewGameUI.cs b/Assets/Script/UI/NewGameUI.cs index 60701309e..01a2fcce2 100644 --- a/Assets/Script/UI/NewGameUI.cs +++ b/Assets/Script/UI/NewGameUI.cs @@ -99,6 +99,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate case "btn_collection": m_CollectionUI.Set(); break; case "btn_mission": m_MissionUI.Set(); break; case "btn_buffad": m_BuffADUI.Set(); break; + case "btn_mail": MailUI.Ins.Set(false); break; case "btn_farm": InGameInfo.Ins.Load_Map(0); break; case "btn_btn_plantingseed": break;