From e781164458d3ce6563a805a5ed88e324b36b8f6c Mon Sep 17 00:00:00 2001 From: hartie95 Date: Mon, 19 Aug 2024 19:37:26 +0200 Subject: [PATCH] [GI/Refactoring] Cleaned up the mail related packets --- .../gi/data/mail/AuthkeySignType.kt | 8 ++-- .../gi/data/mail/ChangeMailStarNotify.kt | 11 +++--- .../gi/data/mail/ClientNewMailNotify.kt | 13 ++++--- .../multi_proto/gi/data/mail/DelMailReq.kt | 11 +++--- .../multi_proto/gi/data/mail/DelMailRsp.kt | 11 +++--- .../gi/data/mail/GetAllMailNotify.kt | 11 +++--- .../multi_proto/gi/data/mail/GetAllMailReq.kt | 14 ++++--- .../gi/data/mail/GetAllMailResultNotify.kt | 19 +++++----- .../multi_proto/gi/data/mail/GetAllMailRsp.kt | 17 +++++---- .../multi_proto/gi/data/mail/GetAuthkeyReq.kt | 13 ++++--- .../multi_proto/gi/data/mail/GetAuthkeyRsp.kt | 15 ++++---- .../gi/data/mail/GetMailItemReq.kt | 11 +++--- .../gi/data/mail/GetMailItemRsp.kt | 11 +++--- .../gi/data/mail/MailChangeNotify.kt | 13 ++++--- .../gi/data/mail/MailCollectState.kt | 4 +- .../multi_proto/gi/data/mail/MailData.kt | 37 ++++++++++--------- .../multi_proto/gi/data/mail/MailItem.kt | 10 ++--- .../gi/data/mail/MailTextContent.kt | 4 +- .../gi/data/mail/ReadMailNotify.kt | 11 +++--- 19 files changed, 131 insertions(+), 113 deletions(-) diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/AuthkeySignType.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/AuthkeySignType.kt index 395d18f..ea3ae2a 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/AuthkeySignType.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/AuthkeySignType.kt @@ -1,13 +1,13 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoEnum -@AddedIn(Version.GI_CB1) +@AddedIn(GI_CB1) @ProtoEnum -enum class AuthkeySignType { +internal enum class AuthkeySignType { AUTHKEY_SIGN_TYPE_NONE, AUTHKEY_SIGN_TYPE_DEFAULT, AUTHKEY_SIGN_TYPE_RSA, -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ChangeMailStarNotify.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ChangeMailStarNotify.kt index 1424cc0..a5fe372 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ChangeMailStarNotify.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ChangeMailStarNotify.kt @@ -1,12 +1,13 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_1_5_0 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.CLIENT -@AddedIn(Version.GI_1_5_0) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.CLIENT) -interface ChangeMailStarNotify { +@AddedIn(GI_1_5_0) +@ProtoCommand(CLIENT) +internal interface ChangeMailStarNotify { var isStar: Boolean var mailIdList: List -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ClientNewMailNotify.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ClientNewMailNotify.kt index 9447541..b37dbf4 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ClientNewMailNotify.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ClientNewMailNotify.kt @@ -1,12 +1,13 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.NOTIFY -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.NOTIFY) -interface ClientNewMailNotify { - var notReadNum: Int +@AddedIn(GI_CB1) +@ProtoCommand(NOTIFY) +internal interface ClientNewMailNotify { var notGotAttachmentNum: Int -} \ No newline at end of file + var notReadNum: Int +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailReq.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailReq.kt index ccbecf2..44be831 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailReq.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailReq.kt @@ -1,11 +1,12 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST) -interface DelMailReq { +@AddedIn(GI_CB1) +@ProtoCommand(REQUEST) +internal interface DelMailReq { var mailIdList: List -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailRsp.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailRsp.kt index 78129ce..bf91698 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailRsp.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/DelMailRsp.kt @@ -1,12 +1,13 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE) -interface DelMailRsp { +@AddedIn(GI_CB1) +@ProtoCommand(RESPONSE) +internal interface DelMailRsp { var mailIdList: List var retCode: Int -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailNotify.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailNotify.kt index 588e499..612e644 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailNotify.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailNotify.kt @@ -1,12 +1,13 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_3_0_0 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.CLIENT -@AddedIn(Version.GI_3_0_0) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.CLIENT) -interface GetAllMailNotify { +@AddedIn(GI_3_0_0) +@ProtoCommand(CLIENT) +internal interface GetAllMailNotify { var isCollected : Boolean -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailReq.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailReq.kt index ae1716b..5f92e4b 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailReq.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailReq.kt @@ -2,11 +2,13 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoCommand -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 +import org.anime_game_servers.core.base.Version.GI_2_4_0 +import org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST) -interface GetAllMailReq { - @AddedIn(Version.GI_2_4_0) +@AddedIn(GI_CB1) +@ProtoCommand(REQUEST) +internal interface GetAllMailReq { + @AddedIn(GI_2_4_0) var isCollected : Boolean -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailResultNotify.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailResultNotify.kt index c7f7f63..e3d4b48 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailResultNotify.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailResultNotify.kt @@ -1,16 +1,17 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_3_0_0 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.NOTIFY -@AddedIn(Version.GI_3_0_0) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.NOTIFY) -interface GetAllMailResultNotify { - var mailList: List - var transaction: String - var totalPageCount: Int - var pageIndex: Int +@AddedIn(GI_3_0_0) +@ProtoCommand(NOTIFY) +internal interface GetAllMailResultNotify { var isCollected: Boolean + var mailList: List + var pageIndex: Int + var totalPageCount: Int + var transaction: String var retCode: Int -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailRsp.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailRsp.kt index c7bd282..f111b1b 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailRsp.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAllMailRsp.kt @@ -1,16 +1,19 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 +import org.anime_game_servers.core.base.Version.GI_1_5_0 +import org.anime_game_servers.core.base.Version.GI_2_4_0 import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE) -interface GetAllMailRsp { +@AddedIn(GI_CB1) +@ProtoCommand(RESPONSE) +internal interface GetAllMailRsp { var mailList: List var retCode: Int - @AddedIn(Version.GI_1_5_0) + @AddedIn(GI_1_5_0) var isTruncated: Boolean - @AddedIn(Version.GI_2_4_0) + @AddedIn(GI_2_4_0) var isCollected: Boolean -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyReq.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyReq.kt index f439abd..245c8d1 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyReq.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyReq.kt @@ -1,13 +1,14 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST) -interface GetAuthkeyReq { +@AddedIn(GI_CB1) +@ProtoCommand(REQUEST) +internal interface GetAuthkeyReq { var authAppid: String - var signType: Int var authkeyVer: Int -} \ No newline at end of file + var signType: Int +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyRsp.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyRsp.kt index c351812..b0249fa 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyRsp.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetAuthkeyRsp.kt @@ -1,16 +1,17 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE) -interface GetAuthkeyRsp { - var authKey: String +@AddedIn(GI_CB1) +@ProtoCommand(RESPONSE) +internal interface GetAuthkeyRsp { var authAppid: String - var signType: Int + var authKey: String var authkeyVer: Int var gameBiz: String + var signType: Int var retCode: Int -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemReq.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemReq.kt index 1f894af..edf78a0 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemReq.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemReq.kt @@ -1,11 +1,12 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.REQUEST) -interface GetMailItemReq { +@AddedIn(GI_CB1) +@ProtoCommand(REQUEST) +internal interface GetMailItemReq { var mailIdList: List -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemRsp.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemRsp.kt index 8d33241..77778be 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemRsp.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/GetMailItemRsp.kt @@ -2,13 +2,14 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.multi_proto.gi.data.general.item.EquipParam -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.RESPONSE) -interface GetMailItemRsp { +@AddedIn(GI_CB1) +@ProtoCommand(RESPONSE) +internal interface GetMailItemRsp { var mailIdList: List var itemList: List var retCode: Int -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailChangeNotify.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailChangeNotify.kt index cbab96f..fe92527 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailChangeNotify.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailChangeNotify.kt @@ -1,12 +1,13 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.NOTIFY -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.NOTIFY) -interface MailChangeNotify { - var mailList: List +@AddedIn(GI_CB1) +@ProtoCommand(NOTIFY) +internal interface MailChangeNotify { var delMailIdList: List -} \ No newline at end of file + var mailList: List +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailCollectState.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailCollectState.kt index c52598d..198e3f6 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailCollectState.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailCollectState.kt @@ -7,7 +7,7 @@ import org.anime_game_servers.core.base.annotations.proto.ProtoEnum @AddedIn(Version.GI_2_4_0) @ProtoEnum -enum class MailCollectState { +internal enum class MailCollectState { @AltName("MAIL_COLLECTIBLE_UNKONW", "MAIL_COLLECT_STATE_COLLECTIBLE_UNKONW", "MAIL_COLLECT_STATE_COLLECTIBLE_UNKNOWN") MAIL_COLLECTIBLE_UNKNOWN, @AltName("MAIL_COLLECT_STATE_NOT_COLLECTIBLE") @@ -17,4 +17,4 @@ enum class MailCollectState { @AltName("MAIL_COLLECT_STATE_COLLECTIBLE_COLLECTED") MAIL_COLLECTIBLE_COLLECTED, -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailData.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailData.kt index be3667b..c1f42aa 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailData.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailData.kt @@ -1,34 +1,35 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 +import org.anime_game_servers.core.base.Version.GI_CB2 +import org.anime_game_servers.core.base.Version.GI_0_9_0 +import org.anime_game_servers.core.base.Version.GI_2_4_0 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.RemovedIn import org.anime_game_servers.core.base.annotations.proto.ProtoModel -@AddedIn(Version.GI_CB1) +@AddedIn(GI_CB1) @ProtoModel -interface MailData { - var mailId: Int - - @RemovedIn(Version.GI_CB2) - var index: Int - - @RemovedIn(Version.GI_CB2) - var textId: Int - var mailTextContent: MailTextContent - var itemList: List// before 0.9 it was EquipParam TODO handle this - var sendTime: Int +internal interface MailData { var expireTime: Int var importance: Int var isRead: Boolean var isAttachmentGot: Boolean + var itemList: List// before 0.9 it was EquipParam TODO handle this + var mailId: Int + var mailTextContent: MailTextContent + var sendTime: Int - @AddedIn(Version.GI_0_9_0) + @RemovedIn(GI_CB2) + var index: Int + @RemovedIn(GI_CB2) + var textId: Int + + @AddedIn(GI_0_9_0) var configId: Int - - @AddedIn(Version.GI_0_9_0) + @AddedIn(GI_0_9_0) var argumentList: List - @AddedIn(Version.GI_2_4_0) + @AddedIn(GI_2_4_0) var collectState: MailCollectState -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailItem.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailItem.kt index 7f32270..c99e755 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailItem.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailItem.kt @@ -3,12 +3,12 @@ package org.anime_game_servers.multi_proto.gi.data.mail import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.multi_proto.gi.data.general.item.EquipParam import org.anime_game_servers.multi_proto.gi.data.general.item.MaterialDeleteInfo -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_0_9_0 import org.anime_game_servers.core.base.annotations.proto.ProtoModel -@AddedIn(Version.GI_0_9_0) +@AddedIn(GI_0_9_0) @ProtoModel -interface MailItem { - var equipParam: EquipParam +internal interface MailItem { var deleteInfo: MaterialDeleteInfo -} \ No newline at end of file + var equipParam: EquipParam +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailTextContent.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailTextContent.kt index 4c8dc40..a5ebcb6 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailTextContent.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/MailTextContent.kt @@ -6,8 +6,8 @@ import org.anime_game_servers.core.base.annotations.proto.ProtoModel @AddedIn(Version.GI_CB1) @ProtoModel -interface MailTextContent { +internal interface MailTextContent { var title: String var content: String var sender: String -} \ No newline at end of file +} diff --git a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ReadMailNotify.kt b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ReadMailNotify.kt index c8c3f68..6228270 100644 --- a/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ReadMailNotify.kt +++ b/gi/src/commonMain/kotlin/org/anime_game_servers/multi_proto/gi/data/mail/ReadMailNotify.kt @@ -1,11 +1,12 @@ package org.anime_game_servers.multi_proto.gi.data.mail -import org.anime_game_servers.core.base.Version +import org.anime_game_servers.core.base.Version.GI_CB1 import org.anime_game_servers.core.base.annotations.AddedIn import org.anime_game_servers.core.base.annotations.proto.ProtoCommand +import org.anime_game_servers.core.base.annotations.proto.CommandType.CLIENT -@AddedIn(Version.GI_CB1) -@ProtoCommand(org.anime_game_servers.core.base.annotations.proto.CommandType.CLIENT) -interface ReadMailNotify { +@AddedIn(GI_CB1) +@ProtoCommand(CLIENT) +internal interface ReadMailNotify { var mailIdList: List -} \ No newline at end of file +}