This commit is contained in:
wh_zcy 2023-06-26 17:46:43 +08:00
commit dd05f01756
14 changed files with 1266 additions and 1036 deletions

View File

@ -9,6 +9,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 50
},
{
"a": "attr",
"t": "gold",
@ -28,6 +33,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -47,6 +57,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -66,6 +81,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 100
},
{
"a": "attr",
"t": "gold",

View File

@ -18097,7 +18097,7 @@
},
"type": 43,
"valid": 0,
"NPC": 10474,
"NPC": -102,
"value": 6,
"filter": [
6
@ -18385,7 +18385,7 @@
},
"type": 43,
"valid": 0,
"NPC": 10594,
"NPC": -102,
"value": 9,
"filter": [
6
@ -18530,7 +18530,7 @@
},
"type": 43,
"valid": 0,
"NPC": 10654,
"NPC": -102,
"value": 12,
"filter": [
6
@ -18672,7 +18672,7 @@
},
"type": 93,
"valid": 0,
"NPC": 10714,
"NPC": -102,
"value": 1,
"filter": [
1,
@ -18837,7 +18837,7 @@
},
"type": 43,
"valid": 0,
"NPC": 10784,
"NPC": -102,
"value": 12,
"filter": [
9
@ -19051,7 +19051,7 @@
},
"type": 43,
"valid": 0,
"NPC": 10874,
"NPC": -102,
"value": 18,
"filter": [
9
@ -19170,7 +19170,7 @@
},
"type": 43,
"valid": 0,
"NPC": 10924,
"NPC": -102,
"value": 8,
"filter": [
12

View File

@ -1618,5 +1618,165 @@
"n": 500
}
]
},
{
"index": "357",
"var": [
{
"a": "item",
"t": "14010001",
"n": 50
}
]
},
{
"index": "358",
"var": [
{
"a": "item",
"t": "14010002",
"n": 50
}
]
},
{
"index": "359",
"var": [
{
"a": "item",
"t": "14010003",
"n": 50
}
]
},
{
"index": "360",
"var": [
{
"a": "item",
"t": "14010004",
"n": 50
}
]
},
{
"index": "361",
"var": [
{
"a": "item",
"t": "14010005",
"n": 50
}
]
},
{
"index": "362",
"var": [
{
"a": "item",
"t": "14010006",
"n": 50
}
]
},
{
"index": "363",
"var": [
{
"a": "item",
"t": "14010007",
"n": 50
}
]
},
{
"index": "364",
"var": [
{
"a": "item",
"t": "14010008",
"n": 50
}
]
},
{
"index": "365",
"var": [
{
"a": "item",
"t": "14010009",
"n": 50
}
]
},
{
"index": "366",
"var": [
{
"a": "item",
"t": "14010010",
"n": 50
}
]
},
{
"index": "367",
"var": [
{
"a": "item",
"t": "14010011",
"n": 50
}
]
},
{
"index": "368",
"var": [
{
"a": "item",
"t": "14010012",
"n": 50
}
]
},
{
"index": "369",
"var": [
{
"a": "item",
"t": "14010013",
"n": 50
}
]
},
{
"index": "370",
"var": [
{
"a": "item",
"t": "14010014",
"n": 50
}
]
},
{
"index": "371",
"var": [
{
"a": "item",
"t": "14010015",
"n": 50
}
]
},
{
"index": "372",
"var": [
{
"a": "item",
"t": "14010016",
"n": 50
}
]
}
]

View File

@ -22921,7 +22921,7 @@
},
{
"id": 956,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -22945,7 +22945,7 @@
},
{
"id": 957,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -22969,7 +22969,7 @@
},
{
"id": 958,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -22993,7 +22993,7 @@
},
{
"id": 959,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23017,7 +23017,7 @@
},
{
"id": 960,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23041,7 +23041,7 @@
},
{
"id": 961,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23065,7 +23065,7 @@
},
{
"id": 962,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23089,7 +23089,7 @@
},
{
"id": 963,
"lotteryid": 14010001,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23113,7 +23113,7 @@
},
{
"id": 964,
"lotteryid": 14010002,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23137,7 +23137,7 @@
},
{
"id": 965,
"lotteryid": 14010003,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23161,7 +23161,7 @@
},
{
"id": 966,
"lotteryid": 14010004,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23185,7 +23185,7 @@
},
{
"id": 967,
"lotteryid": 14010005,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23209,7 +23209,7 @@
},
{
"id": 968,
"lotteryid": 14010006,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23233,7 +23233,7 @@
},
{
"id": 969,
"lotteryid": 14010007,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,
@ -23257,7 +23257,7 @@
},
{
"id": 970,
"lotteryid": 14010008,
"lotteryid": 14010000,
"description": "食材大礼包随机食材",
"type": 1,
"groupwt": 1000,

View File

@ -231,7 +231,7 @@
"木桩"
],
"functionicon": "ty_qp_mz",
"jumpId": 137
"jumpId": 10001
},
{
"Id": 14,

View File

@ -3020,11 +3020,13 @@
"id": 10664,
"heroid": 25001,
"datas": [
"GameMain",
"901"
"WuGuanScene",
"木桩3",
"137"
],
"event": [
0
2,
10200
],
"goto": 0
},
@ -3713,10 +3715,12 @@
"heroid": 25001,
"datas": [
"SmithyScene",
"功能入口-商人",
"139"
],
"event": [
0
10,
122
],
"goto": 0
},

View File

@ -26773,7 +26773,7 @@
"Argu": [
1,
4,
3900
3500
],
"FollowSK": [],
"SucFollowSK": [],
@ -26838,7 +26838,7 @@
"Argu": [
1,
4,
4000
3600
],
"FollowSK": [],
"SucFollowSK": [],
@ -26861,7 +26861,7 @@
"Argu": [
1,
4,
4100
3700
],
"FollowSK": [],
"SucFollowSK": [],
@ -26884,7 +26884,7 @@
"Argu": [
1,
4,
4200
3800
],
"FollowSK": [],
"SucFollowSK": [],
@ -26907,7 +26907,7 @@
"Argu": [
1,
4,
4300
3900
],
"FollowSK": [],
"SucFollowSK": [],
@ -28413,7 +28413,7 @@
"Argu": [
1,
4,
4000
2000
],
"FollowSK": [
255003312
@ -29129,7 +29129,7 @@
"Argu": [
1,
4,
4000
2000
],
"FollowSK": [],
"SucFollowSK": [
@ -29231,7 +29231,7 @@
"Argu": [
1,
4,
1000
500
],
"FollowSK": [],
"SucFollowSK": [],

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -9,6 +9,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 50
},
{
"a": "attr",
"t": "gold",
@ -28,6 +33,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -47,6 +57,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 100
},
{
"a": "attr",
"t": "gold",
@ -66,6 +81,11 @@
"t": "diamond",
"n": 150
},
{
"a": "item",
"t": "14020000",
"n": 100
},
{
"a": "attr",
"t": "gold",

View File

@ -131,7 +131,7 @@
},
"npctxt": {
"key": "worldtask_world_task_npctxt_4",
"text": "击退豺狼小怪小怪"
"text": "击退豺狼小怪"
},
"npc": 10020,
"completetask": [

View File

@ -5,13 +5,29 @@ import (
"go_dreamfactory/pb"
)
//参数校验
// 参数校验
func (this *apiComp) SetDefFormtCheck(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
if len(req.Formt) == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_DBError.ToString(),
Message: "阵容 不能为空!",
}
}
for _, v := range req.Formt {
if v != "" {
return
}
}
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_DBError.ToString(),
Message: "阵容 不能为空!",
}
return
}
///设置防守阵型
// /设置防守阵型
func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefFormtReq) (errdata *pb.ErrorData) {
var (
info *pb.DBArenaUser
@ -51,7 +67,6 @@ func (this *apiComp) SetDefFormt(session comm.IUserSession, req *pb.ArenaSetDefF
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "setdefformt", &pb.ArenaSetDefFormtResp{Issucc: true})

View File

@ -167,7 +167,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
items = append(items, randomGoods(_items))
}
sdata.Buy = make(map[int32]int32)
goods = transGoods(items, sdata)
sdata.LastRefreshTime = configure.Now().Unix()
sdata.ManualRefreshNum++
sdata.Items = make([]int32, len(items))
@ -180,6 +179,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
}
}
goods = transGoods(items, sdata)
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype105, 1)
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype105, 1))
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{"refreshnumgoldShop": shopData.RefreshnumgoldShop, "refreshtimegoldShop": shopData.RefreshtimegoldShop, filed: sdata})
@ -247,6 +247,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
return
}
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{SType: req.SType, IsManualRefresh: req.IsManualRefresh, Goods: goods, SurplusRefreshNum: leftrefnum})
session.SendMsg(string(this.module.GetType()), "getlist", &pb.ShopGetListResp{SType: req.SType, IsManualRefresh: req.IsManualRefresh, Goods: goods, SurplusRefreshNum: leftrefnum, Lastrefreshtime: sdata.LastRefreshTime})
return
}

View File

@ -174,6 +174,7 @@ type ShopGetListResp struct {
IsManualRefresh bool `protobuf:"varint,2,opt,name=IsManualRefresh,proto3" json:"IsManualRefresh"` //是否手动刷新
Goods []*ShopItem `protobuf:"bytes,4,rep,name=Goods,proto3" json:"Goods"` //商品列表
SurplusRefreshNum int32 `protobuf:"varint,5,opt,name=SurplusRefreshNum,proto3" json:"SurplusRefreshNum"` //剩余手动刷新次数
Lastrefreshtime int64 `protobuf:"varint,6,opt,name=lastrefreshtime,proto3" json:"lastrefreshtime"` //上一次刷新时间
}
func (x *ShopGetListResp) Reset() {
@ -236,6 +237,13 @@ func (x *ShopGetListResp) GetSurplusRefreshNum() int32 {
return 0
}
func (x *ShopGetListResp) GetLastrefreshtime() int64 {
if x != nil {
return x.Lastrefreshtime
}
return 0
}
//购买商品 请求
type ShopBuyReq struct {
state protoimpl.MessageState
@ -374,7 +382,7 @@ var file_shop_shop_msg_proto_rawDesc = []byte{
0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73,
0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c,
0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49,
0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xab,
0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xd5,
0x01, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, 0x54,
@ -385,17 +393,20 @@ var file_shop_shop_msg_proto_rawDesc = []byte{
0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x2c,
0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c,
0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x22, 0x65, 0x0a, 0x0a,
0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68,
0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53,
0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70,
0x65, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42,
0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79,
0x4e, 0x75, 0x6d, 0x22, 0x25, 0x0a, 0x0b, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65,
0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01,
0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f,
0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x18,
0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x65, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75,
0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70,
0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x47,
0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f,
0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18,
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x25, 0x0a,
0x0b, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06,
0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73,
0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
}
var (