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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei 2023-06-28 16:09:27 +08:00
commit f0c15515ac
5 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_item.json
View File

@ -10854,7 +10854,7 @@
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_bagwindow_2", "effects": "effect_ui_bagwindow_2",
"modelName": "", "modelName": "",
"box_id": 17111960, "box_id": 17111040,
"synthetize_num": 0, "synthetize_num": 0,
"synthetize_deplete": [], "synthetize_deplete": [],
"synthetize_get": [], "synthetize_get": [],
@ -10887,7 +10887,7 @@
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_bagwindow_2", "effects": "effect_ui_bagwindow_2",
"modelName": "", "modelName": "",
"box_id": 17111860, "box_id": 17111040,
"synthetize_num": 0, "synthetize_num": 0,
"synthetize_deplete": [], "synthetize_deplete": [],
"synthetize_get": [], "synthetize_get": [],
@ -10920,7 +10920,7 @@
"reddottype": 0, "reddottype": 0,
"effects": "effect_ui_bagwindow_2", "effects": "effect_ui_bagwindow_2",
"modelName": "", "modelName": "",
"box_id": 17111860, "box_id": 17111040,
"synthetize_num": 0, "synthetize_num": 0,
"synthetize_deplete": [], "synthetize_deplete": [],
"synthetize_get": [], "synthetize_get": [],

6
bin/json/game_opencond.json
View File

@ -606,7 +606,7 @@
"main": [ "main": [
{ {
"key": 1, "key": 1,
"param": 1 "param": 9999
} }
], ],
"wkqbx": 2, "wkqbx": 2,
@ -1532,7 +1532,7 @@
"main": [ "main": [
{ {
"key": 1, "key": 1,
"param": 10 "param": 6
} }
], ],
"wkqbx": 0, "wkqbx": 0,
@ -1557,7 +1557,7 @@
"main": [ "main": [
{ {
"key": 1, "key": 1,
"param": 20 "param": 10
} }
], ],
"wkqbx": 0, "wkqbx": 0,

6
bin/json/game_pandamasjs.json
View File

@ -4,7 +4,7 @@
"unlock_condition": 20010, "unlock_condition": 20010,
"unlock_conditiondes": { "unlock_conditiondes": {
"key": "pandamas_pandamas_js_unlock_conditiondes_1", "key": "pandamas_pandamas_js_unlock_conditiondes_1",
"text": "完成主线任务“这是哪里”后解锁" "text": "等级1解锁"
} }
}, },
{ {
@ -12,7 +12,7 @@
"unlock_condition": 20010, "unlock_condition": 20010,
"unlock_conditiondes": { "unlock_conditiondes": {
"key": "pandamas_pandamas_js_unlock_conditiondes_2", "key": "pandamas_pandamas_js_unlock_conditiondes_2",
"text": "完成主线任务“初来乍到”后解锁" "text": "等级6解锁"
} }
}, },
{ {
@ -20,7 +20,7 @@
"unlock_condition": 20020, "unlock_condition": 20020,
"unlock_conditiondes": { "unlock_conditiondes": {
"key": "pandamas_pandamas_js_unlock_conditiondes_3", "key": "pandamas_pandamas_js_unlock_conditiondes_3",
"text": "完成主线任务“事件开端”后解锁" "text": "等级10解锁"
} }
} }
] ]

3
modules/equipment/modelEquipment.go
View File

@ -131,6 +131,9 @@ func (this *modelEquipmentComp) AddEquipments(session comm.IUserSession, cIds ma
change = append(change, equipment) change = append(change, equipment)
} }
} }
} else {
//err = fmt.Errorf("cfg.Game_equipment not found equip id %s", k) // 太多地方配置无效装备 这地方暂时只打印错误日志
this.module.Errorf("cfg.Game_equipment not found equip id %s", k)
} }
} }

20
modules/user/module.go
View File

@ -536,23 +536,13 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
} }
return return
} }
//体力消耗，增加玩家经验 } else {
// exp := int32(math.Abs(float64(add))) * ggd.FightPs change.Ps += add
// user.Exp += int64(exp) if change.Ps > ggd.PsUl {
} change.Ps = ggd.PsUl
if change.Ps >= ggd.PsUl {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_UserVitLimit,
Title: pb.ErrorCode_UserVitLimit.ToString(),
} }
}
return
}
change.Ps += add
if change.Ps > ggd.PsUl {
change.Ps = ggd.PsUl
}
case comm.Talent1: case comm.Talent1:
if add < 0 { if add < 0 {
if user.Talent1+add < 0 { if user.Talent1+add < 0 {