liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

铁匠铺顾客收购装备优化

Browse Source
This commit is contained in:
meixiongfeng 2023-09-13 17:07:44 +08:00
parent 700a2ce734
commit 3d3d2f117b
14 changed files with 255 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_combatlevel.json
View File

@ -267,7 +267,7 @@
},
{
"id": 10008,
"scene": "leveldemo_fcamer_1_8",
"scene": "leveldemo_fcamer_dragoncave",
"levelname": "Save the holy tree",
"maintask": [
11187001

16
bin/json/game_dragonplay.json
View File

@ -43,7 +43,13 @@
"exp": 200,
"time": 1,
"cd": 0,
"deplete": [],
"deplete": [
{
"a": "item",
"t": "24012001",
"n": 1
}
],
"bubble": 14005,
"group": 0
},
@ -91,7 +97,13 @@
"exp": 300,
"time": 1,
"cd": 0,
"deplete": [],
"deplete": [
{
"a": "item",
"t": "24012002",
"n": 1
}
],
"bubble": 14005,
"group": 0
},

4
bin/json/game_gameklotski.json
View File

@ -11,10 +11,6 @@
"k": 2,
"v": 3
},
{
"k": 4,
"v": 0
},
{
"k": 4,
"v": 4

10
bin/json/game_gm.json
View File

@ -428,5 +428,15 @@
},
"data": " ",
"prefix": "bingo:opencond"
},
{
"id": 46,
"type": 4,
"text": {
"key": "GM_GM_text_46",
"text": "武馆"
},
"data": "137",
"prefix": ""
}
]

4
bin/json/game_item.json
View File

@ -19809,7 +19809,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "",
"img": "item_24012001",
"intr": {
"key": "item_item_intr_408",
"text": ""
@ -19855,7 +19855,7 @@
"access": [],
"use_skip": 0,
"upper_limit": 0,
"img": "",
"img": "item_24012002",
"intr": {
"key": "item_item_intr_409",
"text": ""

187
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

27
bin/json/game_rdtasknpc.json
View File

@ -380,6 +380,7 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_熊猫_船甲板",
"901"
],
"event": [
@ -488,8 +489,8 @@
"901"
],
"event": [
2,
10120
1,
102
],
"goto": 0
},
@ -531,8 +532,8 @@
"901"
],
"event": [
2,
10140
1,
103
],
"goto": 0
},
@ -585,9 +586,13 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_熊猫_船甲板",
"901"
],
"event": [],
"event": [
2,
10162
],
"goto": 0
},
{
@ -615,8 +620,8 @@
"901"
],
"event": [
2,
10180
1,
103
],
"goto": 0
},
@ -626,12 +631,12 @@
"Levelid": 0,
"datas": [
"GameMain",
"20020_邦尼兔_常驻",
"20020_熊猫_船甲板",
"901"
],
"event": [
2,
10190
10180
],
"goto": 0
},
@ -669,7 +674,7 @@
],
"event": [
2,
10210
10201
],
"goto": 0
},
@ -888,7 +893,7 @@
],
"event": [
2,
10230
10202
],
"goto": 0
},

2
bin/json/game_skillafteratk.json
View File

@ -34170,7 +34170,7 @@
{
"Id": 244001214,
"EmitPR": 1000,
"From": 2,
"From": 12,
"Where": [],
"Order": "",
"Limit": 1,

17
bin/json/game_skillatk.json
View File

@ -17564,7 +17564,7 @@
{
"id": 133001111,
"level": 1,
"MaxLV": 1,
"MaxLV": 5,
"UnavailablePlayTypes": [],
"Name": {
"key": "skill_skill_atk_Name_133001111",
@ -17813,8 +17813,7 @@
"text": "巫嘎对敌方1个目标造成攻击力300%的伤害，并附加1回合[color=#e5621b]冰冻[/color]状态。"
},
"buffid": [
390001106,
390001007
390001106
],
"map": ""
},
@ -17846,8 +17845,7 @@
"text": "伤害提升至310%。"
},
"buffid": [
390001106,
390001007
390001106
],
"map": ""
},
@ -17879,8 +17877,7 @@
"text": "伤害提升至320%。"
},
"buffid": [
390001106,
390001007
390001106
],
"map": ""
},
@ -17912,8 +17909,7 @@
"text": "伤害提升至330%。"
},
"buffid": [
390001106,
390001007
390001106
],
"map": ""
},
@ -17945,8 +17941,7 @@
"text": "伤害提升至340%。"
},
"buffid": [
390001106,
390001007
390001106
],
"map": ""
},

2
bin/json/game_skillbuff.json
View File

@ -3764,7 +3764,7 @@
},
"Desc": {
"key": "skill_skill_buff_Desc_390001431",
"text": "下一次攻击暴击率提升100%。"
"text": "下一次攻击暴击率提升100%，并提高一定暴击伤害。"
},
"BuffType": 67,
"EffectArgu": [

2
bin/json/game_skillpassive.json
View File

@ -2678,7 +2678,7 @@
"Id": 435004211,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",

2
bin/json/game_worldtask.json
View File

@ -71,7 +71,7 @@
"completetask": [
12070020
],
"deliver_npc": 100108,
"deliver_npc": 0,
"taskend_removeitem": [],
"auto_accept": 0,
"tasktips": 0,

16
modules/smithy/api_trade.go
View File

@ -41,15 +41,7 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err
return
}
}
if _, ok := cus.Customers[req.CustomerId]; !ok {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
conf, err := this.module.configure.GetSmithyCustomerConf(cus.Customers[req.CustomerId].CustomerId)
conf, err := this.module.configure.GetSmithyCustomerConf(1)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
@ -67,10 +59,10 @@ func (this *apiComp) Sell(session comm.IUserSession, req *pb.SmithySellReq) (err
EquipIds: req.EquipIds,
}
if cus != nil {
rsp.Customers = cus.Customers
} else {
if len(cus.Customers) == 0 {
rsp.Customers = make(map[string]*pb.CustomerInfo)
} else {
rsp.Customers = cus.Customers
}
session.SendMsg(string(this.module.GetType()), "sell", rsp)

12
modules/smithy/model_trade.go
View File

@ -143,7 +143,17 @@ func (s *modelTrade) updateCustomer(uid string, customerId string) (*pb.DBCustom
limit := s.module.modelStove.StoveSkillAddCustomer(uid)
left := limit - cus.Total
if left < 0 {
return nil, comm.NewCustomError(pb.ErrorCode_SmithyCustomerLimit)
left = 0
cus.LastRefreshTime = configure.Now().Unix()
update := map[string]interface{}{
"customers": cus.Customers,
"total": cus.Total,
"lastRefreshTime": cus.LastRefreshTime,
}
if err := s.Change(uid, update); err != nil {
return nil, err
}
return cus, nil
}
randCustomerId := s.getCustomerRandom()
conf, err := s.module.configure.GetSmithyCustomerConf(randCustomerId)