diff --git a/Entity/Generate/ConfigTable/Entity/GoodsConfig.cs b/Entity/Generate/ConfigTable/Entity/GoodsConfig.cs new file mode 100644 index 0000000..209a9a6 --- /dev/null +++ b/Entity/Generate/ConfigTable/Entity/GoodsConfig.cs @@ -0,0 +1,97 @@ +using System; +using ProtoBuf; +using Fantasy; +using System.Linq; +using System.Reflection; +using System.Collections.Generic; +using System.Collections.Concurrent; +using Fantasy.Serialize; +using NBF.ConfigTable; + +namespace NBF +{ + [ProtoContract] + public sealed partial class GoodsConfig : ASerialize, IConfigTable + { + + [ProtoMember(1)] + public uint Id { get; set; } // Id + [ProtoMember(2)] + public uint[] Shop { get; set; } = Array.Empty(); // 出现商店 + [ProtoMember(3)] + public uint Group { get; set; } // 组 + [ProtoMember(4)] + public string[] Items { get; set; } = Array.Empty(); // 物品 + [ProtoMember(5)] + public uint Price1 { get; set; } // 银币价格 + [ProtoMember(6)] + public uint Price2 { get; set; } // 金币价格 + [ProtoMember(7)] + public uint[] Label { get; set; } = Array.Empty(); // 标签 + [ProtoMember(8)] + public uint Number { get; set; } // 可购买数量 + [ProtoMember(9)] + public uint Disable { get; set; } // 禁用状态 + [ProtoIgnore] + public uint Key => Id; + + #region Static + + private static ConfigContext Context => ConfigTableHelper.Table(); + + public static GoodsConfig Get(uint key) + { + return Context.Get(key); + } + + public static GoodsConfig Get(Predicate match) + { + return Context.Get(match); + } + + public static GoodsConfig Fist() + { + return Context.Fist(); + } + + public static GoodsConfig Last() + { + return Context.Last(); + } + + public static GoodsConfig Fist(Predicate match) + { + return Context.Fist(match); + } + + public static GoodsConfig Last(Predicate match) + { + return Context.Last(match); + } + + public static int Count() + { + return Context.Count(); + } + + public static int Count(Func predicate) + { + return Context.Count(predicate); + } + + public static List GetList() + { + return Context.GetList(); + } + + public static List GetList(Predicate match) + { + return Context.GetList(match); + } + public static void ParseJson(Newtonsoft.Json.Linq.JArray arr) + { + ConfigTableHelper.ParseLine(arr); + } + #endregion + } +} \ No newline at end of file diff --git a/Entity/Generate/ConfigTable/Entity/ItemConfig.cs b/Entity/Generate/ConfigTable/Entity/ItemConfig.cs index 1b1a417..e1aadc4 100644 --- a/Entity/Generate/ConfigTable/Entity/ItemConfig.cs +++ b/Entity/Generate/ConfigTable/Entity/ItemConfig.cs @@ -31,9 +31,7 @@ namespace NBF [ProtoMember(8)] public uint Max { get; set; } // 最大堆叠数量 [ProtoMember(9)] - public uint AutoUse { get; set; } // 获得自动使用 - [ProtoMember(10)] - public uint Deal { get; set; } // 交易类型 + public uint AutoUse { get; set; } // 获得自动使用 [ProtoIgnore] public uint Key => Id; diff --git a/Entity/Generate/NetworkProtocol/CommonProtoData.cs b/Entity/Generate/NetworkProtocol/CommonProtoData.cs index 86b2633..fa4da06 100644 --- a/Entity/Generate/NetworkProtocol/CommonProtoData.cs +++ b/Entity/Generate/NetworkProtocol/CommonProtoData.cs @@ -266,6 +266,38 @@ namespace Fantasy public int Abrasion { get; set; } } /// + /// 商店物品信息 + /// + [ProtoContract] + public partial class ShopItemInfo : AMessage + { + public static ShopItemInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ConfigId = default; + Price = default; + Currency = default; + Sort = default; + Tag = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public uint ConfigId { get; set; } + [ProtoMember(2)] + public uint Price { get; set; } + [ProtoMember(3)] + public uint Currency { get; set; } + [ProtoMember(4)] + public uint Sort { get; set; } + [ProtoMember(5)] + public uint Tag { get; set; } + } + /// /// fish信息 /// [ProtoContract] diff --git a/Entity/Generate/NetworkProtocol/GameMessage.cs b/Entity/Generate/NetworkProtocol/GameMessage.cs index 8660614..9bf8583 100644 --- a/Entity/Generate/NetworkProtocol/GameMessage.cs +++ b/Entity/Generate/NetworkProtocol/GameMessage.cs @@ -392,6 +392,55 @@ namespace Fantasy /// /////////// ******** 商店 *******///////////// /// /// + /// 请求商店商品列表 + /// + [ProtoContract] + public partial class C2Game_GetShopItemsRequest : AMessage, ICustomRouteRequest + { + public static C2Game_GetShopItemsRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Shop = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Game2C_GetShopItemsResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_GetShopItemsRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public uint Shop { get; set; } + } + /// + /// 请求商店商品列表响应 + /// + [ProtoContract] + public partial class Game2C_GetShopItemsResponse : AMessage, ICustomRouteResponse + { + public static Game2C_GetShopItemsResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + Items.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_GetShopItemsResponse; } + [ProtoMember(1)] + public List Items = new List(); + [ProtoMember(2)] + public uint ErrorCode { get; set; } + } + /// /// 请求购买 /// [ProtoContract] @@ -403,6 +452,7 @@ namespace Fantasy } public override void Dispose() { + BuyId = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif @@ -412,6 +462,8 @@ namespace Fantasy public uint OpCode() { return OuterOpcode.C2Game_BuyRequest; } [ProtoIgnore] public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public uint BuyId { get; set; } } /// /// 请求购买响应 @@ -426,16 +478,36 @@ namespace Fantasy public override void Dispose() { ErrorCode = default; - Awards.Clear(); #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif } public uint OpCode() { return OuterOpcode.Game2C_BuyResponse; } [ProtoMember(1)] - public List Awards = new List(); - [ProtoMember(2)] public uint ErrorCode { get; set; } } + /// + /// 活动奖励推送 + /// + [ProtoContract] + public partial class Game2C_RewardNotify : AMessage, ICustomRouteMessage + { + public static Game2C_RewardNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Awards.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_RewardNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.GameRoute; + [ProtoMember(1)] + public List Awards = new List(); + } } diff --git a/Entity/Generate/NetworkProtocol/OuterOpcode.cs b/Entity/Generate/NetworkProtocol/OuterOpcode.cs index b33d902..e4d8a73 100644 --- a/Entity/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Entity/Generate/NetworkProtocol/OuterOpcode.cs @@ -16,63 +16,66 @@ namespace Fantasy public const uint Game2C_FishChange = 2147493650; public const uint C2Game_SellFishRequest = 2281711382; public const uint Game2C_SellFishResponse = 2415929110; - public const uint C2Game_BuyRequest = 2281711383; - public const uint Game2C_BuyResponse = 2415929111; - public const uint C2Map_CreateRoomRequest = 2281711384; - public const uint Map2C_CreateRoomResponse = 2415929112; + public const uint C2Game_GetShopItemsRequest = 2281711383; + public const uint Game2C_GetShopItemsResponse = 2415929111; + public const uint C2Game_BuyRequest = 2281711384; + public const uint Game2C_BuyResponse = 2415929112; + public const uint Game2C_RewardNotify = 2147493651; + public const uint C2Map_CreateRoomRequest = 2281711385; + public const uint Map2C_CreateRoomResponse = 2415929113; public const uint C2G_ExitRoomRequest = 268445457; public const uint G2C_ExitRoomResponse = 402663185; public const uint C2G_EnterMapRequest = 268445458; public const uint G2C_EnterMapResponse = 402663186; - public const uint Map2C_ChangeMap = 2147493651; + public const uint Map2C_ChangeMap = 2147493652; public const uint C2A_LoginRequest = 268445459; public const uint A2C_LoginResponse = 402663187; public const uint C2G_LoginRequest = 268445460; public const uint G2C_LoginResponse = 402663188; public const uint G2C_RepeatLogin = 134227729; - public const uint C2Game_GetRoleInfoRequest = 2281711385; - public const uint Game2C_GetRoleInfoResponse = 2415929113; - public const uint Map2C_RoleEnterRoomNotify = 2147493652; - public const uint Map2C_RoleExitRoomNotify = 2147493653; - public const uint C2Map_RolePropertyChange = 2147493654; - public const uint Map2C_RoleStateNotify = 2147493655; - public const uint Map2C_RoleGearChangeNotify = 2147493656; - public const uint Map2C_RolePropertyChangeNotify = 2147493657; - public const uint C2Map_Move = 2147493658; - public const uint C2Map_Look = 2147493659; - public const uint Map2C_MoveNotify = 2147493660; - public const uint Map2C_LookeNotify = 2147493661; - public const uint C2S_GetConversationsRequest = 2281711386; - public const uint S2C_GetConversationsResponse = 2415929114; - public const uint C2S_SendMailRequest = 2281711387; - public const uint S2C_SendMailResponse = 2415929115; - public const uint C2S_DeleteMailRequest = 2281711388; - public const uint S2C_DeleteMailResponse = 2415929116; - public const uint S2C_HaveMail = 2147493662; - public const uint S2C_MailState = 2147493663; - public const uint C2S_CreateChannelRequest = 2281711389; - public const uint S2C_CreateChannelResponse = 2415929117; - public const uint C2S_JoinChannelRequest = 2281711390; - public const uint S2C_JoinChannelResponse = 2415929118; - public const uint C2S_SendMessageRequest = 2281711391; - public const uint S2C_SendMessageResponse = 2415929119; - public const uint S2C_Message = 2147493664; - public const uint C2S_CreateClubRequest = 2281711392; - public const uint S2C_CreateClubResponse = 2415929120; - public const uint C2S_GetClubInfoRequest = 2281711393; - public const uint S2C_GetClubInfoResponse = 2415929121; - public const uint C2S_GetMemberListRequest = 2281711394; - public const uint S2C_GetMemberListResponse = 2415929122; - public const uint C2S_GetClubListRequest = 2281711395; - public const uint S2C_GetClubListResponse = 2415929123; - public const uint C2S_JoinClubRequest = 2281711396; - public const uint S2C_JoinClubResponse = 2415929124; - public const uint C2S_LeaveClubRequest = 2281711397; - public const uint S2C_LeaveClubResponse = 2415929125; - public const uint C2S_DissolveClubRequest = 2281711398; - public const uint S2C_DissolveClubResponse = 2415929126; - public const uint C2S_DisposeJoinRequest = 2281711399; - public const uint S2C_DisposeJoinResponse = 2415929127; - public const uint S2C_ClubChange = 2147493665; + public const uint C2Game_GetRoleInfoRequest = 2281711386; + public const uint Game2C_GetRoleInfoResponse = 2415929114; + public const uint Map2C_RoleEnterRoomNotify = 2147493653; + public const uint Map2C_RoleExitRoomNotify = 2147493654; + public const uint C2Map_RolePropertyChange = 2147493655; + public const uint Map2C_RoleStateNotify = 2147493656; + public const uint Map2C_RoleGearChangeNotify = 2147493657; + public const uint Map2C_RolePropertyChangeNotify = 2147493658; + public const uint C2Map_Move = 2147493659; + public const uint C2Map_Look = 2147493660; + public const uint Map2C_MoveNotify = 2147493661; + public const uint Map2C_LookeNotify = 2147493662; + public const uint C2S_GetConversationsRequest = 2281711387; + public const uint S2C_GetConversationsResponse = 2415929115; + public const uint C2S_SendMailRequest = 2281711388; + public const uint S2C_SendMailResponse = 2415929116; + public const uint C2S_DeleteMailRequest = 2281711389; + public const uint S2C_DeleteMailResponse = 2415929117; + public const uint S2C_HaveMail = 2147493663; + public const uint S2C_MailState = 2147493664; + public const uint C2S_CreateChannelRequest = 2281711390; + public const uint S2C_CreateChannelResponse = 2415929118; + public const uint C2S_JoinChannelRequest = 2281711391; + public const uint S2C_JoinChannelResponse = 2415929119; + public const uint C2S_SendMessageRequest = 2281711392; + public const uint S2C_SendMessageResponse = 2415929120; + public const uint S2C_Message = 2147493665; + public const uint C2S_CreateClubRequest = 2281711393; + public const uint S2C_CreateClubResponse = 2415929121; + public const uint C2S_GetClubInfoRequest = 2281711394; + public const uint S2C_GetClubInfoResponse = 2415929122; + public const uint C2S_GetMemberListRequest = 2281711395; + public const uint S2C_GetMemberListResponse = 2415929123; + public const uint C2S_GetClubListRequest = 2281711396; + public const uint S2C_GetClubListResponse = 2415929124; + public const uint C2S_JoinClubRequest = 2281711397; + public const uint S2C_JoinClubResponse = 2415929125; + public const uint C2S_LeaveClubRequest = 2281711398; + public const uint S2C_LeaveClubResponse = 2415929126; + public const uint C2S_DissolveClubRequest = 2281711399; + public const uint S2C_DissolveClubResponse = 2415929127; + public const uint C2S_DisposeJoinRequest = 2281711400; + public const uint S2C_DisposeJoinResponse = 2415929128; + public const uint S2C_ClubChange = 2147493666; } } diff --git a/Main/configs.json b/Main/configs.json index ad8bec3..d4db5ca 100644 --- a/Main/configs.json +++ b/Main/configs.json @@ -55,8 +55,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30002, @@ -67,8 +66,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30003, @@ -79,8 +77,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30004, @@ -91,8 +88,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30005, @@ -103,8 +99,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30006, @@ -115,8 +110,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30007, @@ -127,56 +121,51 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30008, "Model": "rods/syberia/mark_10168/mark_10168_3LB", "Type": 308, - "Quality": 0, + "Quality": 3, "Brand": 0, "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30009, "Model": "rods/syberia/match_10025/match_10025_M130H", "Type": 309, - "Quality": 0, + "Quality": 4, "Brand": 0, "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30010, "Model": "rods/syberia/picker_10052/picker_10052_P300-MH", "Type": 310, - "Quality": 0, + "Quality": 5, "Brand": 0, "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 30011, "Model": "rods/syberia/spod_10133/spod_10133_3LB", "Type": 311, - "Quality": 0, + "Quality": 4, "Brand": 0, "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40001, @@ -187,8 +176,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40002, @@ -199,8 +187,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40003, @@ -211,8 +198,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40004, @@ -223,8 +209,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40005, @@ -235,8 +220,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40006, @@ -247,8 +231,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40007, @@ -259,8 +242,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40008, @@ -271,8 +253,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40009, @@ -283,8 +264,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 40010, @@ -295,8 +275,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50001, @@ -307,8 +286,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50002, @@ -319,8 +297,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50003, @@ -331,8 +308,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50004, @@ -343,8 +319,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50005, @@ -355,8 +330,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50006, @@ -367,8 +341,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50007, @@ -379,8 +352,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50008, @@ -391,8 +363,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50009, @@ -403,8 +374,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50010, @@ -415,8 +385,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50011, @@ -427,8 +396,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50012, @@ -439,8 +407,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50013, @@ -451,8 +418,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 50014, @@ -463,8 +429,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60001, @@ -475,8 +440,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60002, @@ -487,8 +451,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60003, @@ -499,8 +462,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60004, @@ -511,8 +473,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60005, @@ -523,8 +484,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60006, @@ -535,8 +495,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60007, @@ -547,8 +506,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60008, @@ -559,8 +517,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60009, @@ -571,8 +528,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 60010, @@ -583,8 +539,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 70001, @@ -595,8 +550,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 70002, @@ -607,8 +561,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 70003, @@ -619,8 +572,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 70004, @@ -631,8 +583,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80001, @@ -643,8 +594,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80002, @@ -655,8 +605,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80003, @@ -667,8 +616,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80004, @@ -679,8 +627,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80005, @@ -691,8 +638,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80006, @@ -703,8 +649,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80007, @@ -715,8 +660,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80008, @@ -727,8 +671,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80009, @@ -739,8 +682,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80010, @@ -751,8 +693,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80011, @@ -763,8 +704,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80012, @@ -775,8 +715,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 80013, @@ -787,8 +726,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90001, @@ -799,8 +737,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90002, @@ -811,8 +748,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90003, @@ -823,8 +759,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90004, @@ -835,8 +770,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90005, @@ -847,8 +781,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90006, @@ -859,8 +792,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90007, @@ -871,8 +803,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90008, @@ -883,8 +814,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90009, @@ -895,8 +825,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90010, @@ -907,8 +836,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90011, @@ -919,8 +847,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90012, @@ -931,8 +858,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90013, @@ -943,8 +869,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90014, @@ -955,8 +880,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90015, @@ -967,8 +891,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90016, @@ -979,8 +902,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90017, @@ -991,8 +913,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90018, @@ -1003,8 +924,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90019, @@ -1015,8 +935,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 90020, @@ -1027,8 +946,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100001, @@ -1039,8 +957,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100002, @@ -1051,8 +968,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100003, @@ -1063,8 +979,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100004, @@ -1075,8 +990,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100005, @@ -1087,8 +1001,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100006, @@ -1099,8 +1012,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100007, @@ -1111,8 +1023,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100008, @@ -1123,8 +1034,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100009, @@ -1135,8 +1045,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 100010, @@ -1147,8 +1056,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 }, { "Id": 110001, @@ -1159,8 +1067,7 @@ "Weight": 0, "Length": 0, "Max": 0, - "AutoUse": 0, - "Deal": 0 + "AutoUse": 0 } ], "ReelConfig": [ @@ -1353,6 +1260,1572 @@ "ConstructionType": 0 } ], + "GoodsConfig": [ + { + "Id": 3030001, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030002, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030003, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030004, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030005, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30005" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030006, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30006" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030007, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30007" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030008, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30008" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030009, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30009" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030010, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30010" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3030011, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "30011" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040011, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040012, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040013, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040014, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040015, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40005" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040016, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40006" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040017, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40007" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040018, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40008" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040019, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40009" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3040020, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "40010" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050001, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050002, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050003, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050004, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050005, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50005" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050006, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50006" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050007, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50007" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050008, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50008" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050009, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50009" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050010, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50010" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050011, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50011" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050012, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50012" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050013, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50013" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3050014, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "50014" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060001, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060002, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060003, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060004, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060005, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60005" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060006, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60006" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060007, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60007" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060008, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60008" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060009, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60009" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3060010, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "60010" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3070001, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "70001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3070002, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "70002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3070003, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "70003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3070004, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "70004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080001, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080002, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080003, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080004, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080005, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80005" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080006, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80006" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080007, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80007" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080008, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80008" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080009, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80009" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080010, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80010" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080011, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80011" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080012, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80012" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3080013, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "80013" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090001, + "Shop": [ + 0 + ], + "Group": 3090001, + "Items": [ + "90001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090002, + "Shop": [ + 0 + ], + "Group": 3090001, + "Items": [ + "90002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090003, + "Shop": [ + 0 + ], + "Group": 3090001, + "Items": [ + "90003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090004, + "Shop": [ + 0 + ], + "Group": 3090001, + "Items": [ + "90004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090005, + "Shop": [ + 0 + ], + "Group": 3090005, + "Items": [ + "90005" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090006, + "Shop": [ + 0 + ], + "Group": 3090005, + "Items": [ + "90006" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090007, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90007" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090008, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90008" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090009, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90009" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090010, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90010" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090011, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90011" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090012, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90012" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090013, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90013" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090014, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90014" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090015, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90015" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090016, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90016" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090017, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90017" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090018, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90018" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090019, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90019" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3090020, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "90020" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100001, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100001" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100002, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100002" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100003, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100003" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100004, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100004" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100005, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100005" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100006, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100006" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100007, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100007" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100008, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100008" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100009, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100009" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + }, + { + "Id": 3100010, + "Shop": [ + 0 + ], + "Group": 0, + "Items": [ + "100010" + ], + "Price1": 2, + "Price2": 1, + "Label": [ + 0 + ], + "Number": 0, + "Disable": 0 + } + ], "FishConfig": [ { "Id": 210001, diff --git a/Tools/NetworkProtocol/Outer/GameMessage.proto b/Tools/NetworkProtocol/Outer/GameMessage.proto index c4489df..e34f4ac 100644 --- a/Tools/NetworkProtocol/Outer/GameMessage.proto +++ b/Tools/NetworkProtocol/Outer/GameMessage.proto @@ -105,15 +105,45 @@ message Game2C_SellFishResponse // ICustomRouteResponse ////////////// ******** 商店 *******///////////// +///请求商店商品列表 +message C2Game_GetShopItemsRequest // ICustomRouteRequest,Game2C_GetShopItemsResponse,GameRoute +{ + uint32 Shop = 1;//请求商店列表 +} + +///请求商店商品列表响应 +message Game2C_GetShopItemsResponse // ICustomRouteResponse +{ + repeated ShopItemInfo Items = 1; //列表 +} ///请求购买 message C2Game_BuyRequest // ICustomRouteRequest,Game2C_GetFishsResponse,GameRoute { - + uint32 BuyId = 1;//购买商品id } ///请求购买响应 message Game2C_BuyResponse // ICustomRouteResponse { - repeated AwardInfo Awards = 1; //奖励 + +} + +///活动奖励推送 +message Game2C_RewardNotify // ICustomRouteMessage,GameRoute +{ + repeated AwardInfo Awards = 1; +} + +////////////// ******** GM *******///////////// +///请求执行GM +message C2Game_GMRequest // ICustomRouteRequest,Game2C_GMResponse,GameRoute +{ + string Cmd = 1; + string Args = 2; +} + +///执行GM返回 +message Game2C_GMResponse // ICustomRouteResponse +{ } \ No newline at end of file diff --git a/Tools/NetworkProtocol/Outer/data/CommonProtoData.proto b/Tools/NetworkProtocol/Outer/data/CommonProtoData.proto index 83614ef..dd62e48 100644 --- a/Tools/NetworkProtocol/Outer/data/CommonProtoData.proto +++ b/Tools/NetworkProtocol/Outer/data/CommonProtoData.proto @@ -80,6 +80,15 @@ message ItemInfo int64 GetTime = 5; //获得时间 int32 Abrasion = 6; //耐久度 } +///商店物品信息 +message ShopItemInfo +{ + uint32 ConfigId = 1; //商品配置id + uint32 Price = 2; //价格 + uint32 Currency = 3; //货币类型 + uint32 Sort = 4; //排序 + uint32 Tag = 5; //特殊标签 +} ///fish信息 message FishInfo