This commit is contained in:
sk 2024-04-26 10:59:41 +08:00
parent e593140357
commit b3c791a33e
17 changed files with 4108 additions and 3204 deletions

3
data/DB_GiftCard.dat Normal file
View File

@ -0,0 +1,3 @@
6‘š; 7日礼å“<C3A5>å<EFBFBD>¡"ц
" ¡<>À–±*¡<>À„=08

18
data/DB_GiftCard.json Normal file
View File

@ -0,0 +1,18 @@
{
"Arr": [
{
"Id": 1,
"ShopID": 970001,
"Name": "7日礼品卡",
"Rewards": {
"100001": 5000000,
"50001": 10
},
"DayRewards": {
"100001": 1000000
},
"Time": 7,
"Equity": 1
}
]
}

View File

@ -1,5 +1,5 @@
6с├т├у├жв"║█ю└=
.ь├ы├з├ш"║█ю└=
Wт├в├ь├ы├ш├с├у├ж├з" ║█─╜Б
]в├ь├ы├ш├т├у├ж├з├э├с"╒█Т
6в├с├т├у├ж├"║█ю└=
.з├ш├ь├ы"║█ю└=
Wу├ь├з├с├т├ж├в├ы├ш" ║█─╜Б
]с├ж├в├ь├т├у├ы├з├ш├э"╒█Т

Binary file not shown.

View File

@ -2,6 +2,7 @@
"Arr": [
{
"Id": 1,
"Order": 1,
"ActivityType": 1,
"TaskType": 1,
"TargetTimes": 1,
@ -17,6 +18,7 @@
},
{
"Id": 2,
"Order": 2,
"ActivityType": 1,
"TaskType": 2,
"TargetTimes": 1,
@ -32,6 +34,7 @@
},
{
"Id": 3,
"Order": 3,
"ActivityType": 1,
"TaskType": 3,
"TargetTimes": 1,
@ -43,6 +46,7 @@
},
{
"Id": 4,
"Order": 4,
"ActivityType": 1,
"TaskType": 4,
"TargetTimes": 1,
@ -55,6 +59,7 @@
},
{
"Id": 5,
"Order": 5,
"ActivityType": 1,
"TaskType": 5,
"TargetTimes": 10,
@ -67,6 +72,7 @@
},
{
"Id": 6,
"Order": 6,
"ActivityType": 1,
"TaskType": 6,
"TargetTimes": 1,
@ -79,6 +85,7 @@
},
{
"Id": 7,
"Order": 1,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 200,
@ -89,6 +96,7 @@
},
{
"Id": 8,
"Order": 2,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 300,
@ -99,6 +107,7 @@
},
{
"Id": 9,
"Order": 3,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 400,
@ -109,6 +118,7 @@
},
{
"Id": 10,
"Order": 4,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 500,
@ -119,6 +129,7 @@
},
{
"Id": 11,
"Order": 5,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 600,
@ -129,6 +140,7 @@
},
{
"Id": 12,
"Order": 1,
"ActivityType": 3,
"TaskType": 10,
"TargetTimes": 1,
@ -140,6 +152,7 @@
},
{
"Id": 13,
"Order": 2,
"ActivityType": 3,
"TaskType": 5,
"TargetTimes": 10,
@ -152,6 +165,7 @@
},
{
"Id": 14,
"Order": 3,
"ActivityType": 3,
"TaskType": 11,
"TargetTimes": 10000000,
@ -162,6 +176,7 @@
},
{
"Id": 15,
"Order": 4,
"ActivityType": 3,
"TaskType": 4,
"TargetTimes": 10,
@ -174,6 +189,7 @@
},
{
"Id": 16,
"Order": 5,
"ActivityType": 3,
"TaskType": 16,
"TargetTimes": 3,
@ -185,9 +201,10 @@
},
{
"Id": 17,
"Order": 1,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 1000,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
@ -196,9 +213,10 @@
},
{
"Id": 18,
"Order": 2,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 10000,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
@ -207,9 +225,10 @@
},
{
"Id": 19,
"Order": 3,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 20000,
"TargetTimes": 200000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
@ -218,14 +237,495 @@
},
{
"Id": 20,
"Order": 4,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 50000,
"TargetTimes": 1000000,
"FinishTimes": 1,
"Award": {
"100001": 50000000,
"100002": 100
}
},
{
"Id": 10001,
"Order": 1,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 100000000,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 10002,
"Order": 7,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 1000000000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 10003,
"Order": 13,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 10000000000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 10004,
"Order": 19,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 100000000000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 10005,
"Order": 25,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 500000000000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 10006,
"Order": 31,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 1000000000000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 20001,
"Order": 2,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 20002,
"Order": 8,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 20003,
"Order": 14,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 5000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 20004,
"Order": 20,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 20005,
"Order": 26,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 20006,
"Order": 32,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 30001,
"Order": 3,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 30002,
"Order": 9,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 30003,
"Order": 15,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 5000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 30004,
"Order": 21,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 30005,
"Order": 27,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 30006,
"Order": 33,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 40001,
"Order": 4,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 40002,
"Order": 10,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 40003,
"Order": 16,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 5000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 40004,
"Order": 22,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 40005,
"Order": 28,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 40006,
"Order": 34,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 50001,
"Order": 5,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 10,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"Position": [
1,
1
]
},
{
"Id": 50002,
"Order": 11,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"Position": [
1,
1
]
},
{
"Id": 50003,
"Order": 17,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"Position": [
1,
1
]
},
{
"Id": 50004,
"Order": 23,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"Position": [
1,
1
]
},
{
"Id": 50005,
"Order": 29,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"Position": [
1,
1
]
},
{
"Id": 50006,
"Order": 35,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"Position": [
1,
1
]
},
{
"Id": 60001,
"Order": 6,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 10,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
}
},
{
"Id": 60002,
"Order": 12,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 20,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
}
},
{
"Id": 60003,
"Order": 18,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 50,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
}
},
{
"Id": 60004,
"Order": 24,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
}
},
{
"Id": 60005,
"Order": 30,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 500,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
}
},
{
"Id": 60006,
"Order": 36,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
}
}
]
}

File diff suppressed because it is too large Load Diff

View File

@ -203,6 +203,8 @@ enum PlayerPacketID {
PACKET_SC_PhoneLotteryCount = 2820;//
PACKET_CSADV = 2821; // 广
PACKET_SCADV = 2822; // 广
PACKET_SCGetWeekCardAwary = 2823;//
}
//
@ -310,6 +312,14 @@ message PlayerData {
int32 VipShopRefreshCount =45; //vip当前已使用免费刷新次数
string Signature = 46; //
int32 Age = 47; //
repeated WeekInfo WeekCard = 48;//
}
//
message WeekInfo{
int32 Id =1;
int64 WeekCardTime =2; //
bool weekCardAward = 3;//
}
//线 LogicId
message MiniGameInfo{
@ -1150,4 +1160,11 @@ message CSADV {
// PACKET_SCADV
message SCADV {
repeated int32 Param = 1; // 0广
}
//
//PACKET_SCGetWeekCardAwary
message SCGetWeekCardAwary{
int32 id = 1;
repeated PayItem Items =2;
bool weekCardAward = 3;
}

File diff suppressed because it is too large Load Diff

View File

@ -1055,6 +1055,28 @@ message DB_GiftBoxArray {
repeated DB_GiftBox Arr = 1;
}
message DB_GiftCard {
int32 Id = 1;
int32 ShopID = 2;
string Name = 3;
map<int64, int64> Rewards = 4;
map<int64, int64> DayRewards = 5;
int32 Time = 6;
int32 Equity = 7;
}
message DB_GiftCardArray {
repeated DB_GiftCard Arr = 1;
}
message DB_IceAgeElementRate {
int32 Id = 1;
@ -1483,19 +1505,21 @@ message DB_Task {
int32 Id = 1;
int32 ActivityType = 2;
int32 Order = 2;
int32 TaskType = 3;
int32 ActivityType = 3;
int64 TargetTimes = 4;
int32 TaskType = 4;
int64 FinishTimes = 5;
int64 TargetTimes = 5;
map<int64, int64> Award = 6;
int64 FinishTimes = 6;
int32 GameType = 7;
map<int64, int64> Award = 7;
repeated int32 Position = 8;
int32 GameType = 8;
repeated int32 Position = 9;
}

File diff suppressed because it is too large Load Diff

View File

@ -593,22 +593,17 @@ message GWPlayerForceLeave{
//PACKET_GW_PLAYERDATA
message PlayerData {
int32 SnId = 1;//id
int64 Bet = 2;//()
int64 Gain = 3;//,
int64 Tax = 4;// Gain的税收
int64 OtherTax = 5;//(:)
int64 Coin = 6;//
int64 FlowCoin = 7;//
int64 Lottery = 8;//
int32 Kind = 9;//
repeated int32 Card = 10;//
int64 GameCoinTs = 11;//
int64 WBGain = 12; //
int32 WinState = 13; // 1: 2: 3:
int32 SnId = 1; // id
int64 Bet = 2; //
int64 Gain = 3; // ,
int64 Tax = 4; // Gain的税收
int64 Coin = 5; //
int64 GameCoinTs = 6; //
int64 WBGain = 7; // ,
int32 WinState = 8; // 1: 2: 3:, Gain区分不了输赢的游戏必传这个参数
}
message GWPlayerData {
repeated PlayerData Datas = 1;//
repeated PlayerData Datas = 1;//
int32 GameFreeId = 2;//id
int32 SceneId = 4; //id
}

View File

@ -227,7 +227,7 @@ type CSTaskList struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
}
func (x *CSTaskList) Reset() {
@ -275,7 +275,7 @@ type SCTaskList struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
List []*TaskData `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"` // 任务列表
}
@ -332,7 +332,7 @@ type CSTaskReward struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
Id int32 `protobuf:"varint,2,opt,name=Id,proto3" json:"Id,omitempty"` // 任务id
}
@ -453,7 +453,7 @@ type SCTaskChange struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
List []*TaskData `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"` // 任务列表
}
@ -508,7 +508,7 @@ type CSTaskDebugInc struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
Id int32 `protobuf:"varint,2,opt,name=Id,proto3" json:"Id,omitempty"` // 任务id
AddNum int32 `protobuf:"varint,3,opt,name=AddNum,proto3" json:"AddNum,omitempty"` // 直接增加次数
}

View File

@ -33,18 +33,18 @@ message TaskData{
//
// PACKET_CSTaskList
message CSTaskList{
int32 Tp = 1; // 1: 2: 3: 4:
int32 Tp = 1; // 1: 2: 3: 4: 5:
}
// PACKET_SCTaskList
message SCTaskList{
int32 Tp = 1; // 1: 2: 3: 4:
int32 Tp = 1; // 1: 2: 3: 4: 5:
repeated TaskData List = 2; //
}
//
// PACKET_CSTaskReward
message CSTaskReward{
int32 Tp = 1; // 1: 2: 3: 4:
int32 Tp = 1; // 1: 2: 3: 4: 5:
int32 Id = 2; // id
}
// PACKET_SCTaskReward
@ -57,12 +57,12 @@ message SCTaskReward{
//
// PACKET_SCTaskChange
message SCTaskChange{
int32 Tp = 1; // 1: 2: 3: 4:
int32 Tp = 1; // 1: 2: 3: 4: 5:
repeated TaskData List = 2; //
}
message CSTaskDebugInc{
int32 Tp = 1; // 1: 2: 3: 4:
int32 Tp = 1; // 1: 2: 3: 4: 5:
int32 Id = 2; // id
int32 AddNum = 3; //
}

View File

@ -1015,7 +1015,7 @@ type AddItem struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
ItemType int32 `protobuf:"varint,1,opt,name=ItemType,proto3" json:"ItemType,omitempty"` // 类型; 1场次加成 2道具 3宠物 4角色 5vip加成
ItemType int32 `protobuf:"varint,1,opt,name=ItemType,proto3" json:"ItemType,omitempty"` // 类型; 1场次加成 2道具 3宠物 4角色 5vip加成 6周卡加成
ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId,omitempty"` // ID
Addition int32 `protobuf:"varint,3,opt,name=Addition,proto3" json:"Addition,omitempty"` // 加成(百分比)
Score int64 `protobuf:"varint,4,opt,name=Score,proto3" json:"Score,omitempty"` // 加成分数

View File

@ -131,7 +131,7 @@ message SCTienLenPlayerLeave {
}
message AddItem {
int32 ItemType = 1; // ; 1 2 3 4 5vip加成
int32 ItemType = 1; // ; 1 2 3 4 5vip加成 6
int32 ItemId = 2; // ID
int32 Addition = 3; //
int64 Score = 4; //

BIN
xlsx/DB_GiftCard.xlsx Normal file

Binary file not shown.

Binary file not shown.