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:
meixiongfeng 2024-02-02 10:13:39 +08:00
commit 1c1c37e6f8
7 changed files with 93 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_buriedcondi.json
View File

@ -5333,7 +5333,7 @@
},
"value": 1,
"filter": [
1102008
1102009
],
"filter2": []
},

8
bin/json/game_buriedtype.json
View File

@ -1502,12 +1502,16 @@
{
"id": 257,
"insert": 2,
"filter": []
"filter": [
"eq"
]
},
{
"id": 258,
"insert": 2,
"filter": []
"filter": [
"eq"
]
},
{
"id": 259,

96
bin/json/game_equip.json
View File

@ -31764,7 +31764,7 @@
"key": "equip_equip_suitintr_649",
"text": "攻击型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 1,
"color": 1,
"Effects": "",
@ -31813,7 +31813,7 @@
"key": "equip_equip_suitintr_650",
"text": "防御型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 1,
"color": 1,
"Effects": "",
@ -31862,7 +31862,7 @@
"key": "equip_equip_suitintr_651",
"text": "辅助型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 1,
"color": 1,
"Effects": "",
@ -31911,7 +31911,7 @@
"key": "equip_equip_suitintr_652",
"text": "控制型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 1,
"color": 1,
"Effects": "",
@ -31960,7 +31960,7 @@
"key": "equip_equip_suitintr_653",
"text": "攻击型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 2,
"color": 2,
"Effects": "",
@ -32009,7 +32009,7 @@
"key": "equip_equip_suitintr_654",
"text": "防御型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 2,
"color": 2,
"Effects": "",
@ -32058,7 +32058,7 @@
"key": "equip_equip_suitintr_655",
"text": "辅助型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 2,
"color": 2,
"Effects": "",
@ -32107,7 +32107,7 @@
"key": "equip_equip_suitintr_656",
"text": "控制型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 2,
"color": 2,
"Effects": "",
@ -32156,7 +32156,7 @@
"key": "equip_equip_suitintr_657",
"text": "攻击型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 3,
"color": 3,
"Effects": "",
@ -32205,7 +32205,7 @@
"key": "equip_equip_suitintr_658",
"text": "防御型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 3,
"color": 3,
"Effects": "",
@ -32254,7 +32254,7 @@
"key": "equip_equip_suitintr_659",
"text": "辅助型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 3,
"color": 3,
"Effects": "",
@ -32303,7 +32303,7 @@
"key": "equip_equip_suitintr_660",
"text": "控制型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 3,
"color": 3,
"Effects": "",
@ -32352,7 +32352,7 @@
"key": "equip_equip_suitintr_661",
"text": "攻击型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 4,
"color": 4,
"Effects": "",
@ -32401,7 +32401,7 @@
"key": "equip_equip_suitintr_662",
"text": "防御型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 4,
"color": 4,
"Effects": "",
@ -32450,7 +32450,7 @@
"key": "equip_equip_suitintr_663",
"text": "辅助型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 4,
"color": 4,
"Effects": "",
@ -32499,7 +32499,7 @@
"key": "equip_equip_suitintr_664",
"text": "控制型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 4,
"color": 4,
"Effects": "",
@ -32548,7 +32548,7 @@
"key": "equip_equip_suitintr_665",
"text": "攻击型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 5,
"color": 5,
"Effects": "",
@ -32595,7 +32595,7 @@
"key": "equip_equip_suitintr_666",
"text": "防御型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 5,
"color": 5,
"Effects": "",
@ -32642,7 +32642,7 @@
"key": "equip_equip_suitintr_667",
"text": "辅助型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 5,
"color": 5,
"Effects": "",
@ -32689,7 +32689,7 @@
"key": "equip_equip_suitintr_668",
"text": "控制型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 5,
"color": 5,
"Effects": "",
@ -32736,7 +32736,7 @@
"key": "equip_equip_suitintr_669",
"text": "攻击型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 6,
"color": 6,
"Effects": "",
@ -32783,7 +32783,7 @@
"key": "equip_equip_suitintr_670",
"text": "防御型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 6,
"color": 6,
"Effects": "",
@ -32830,7 +32830,7 @@
"key": "equip_equip_suitintr_671",
"text": "辅助型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 6,
"color": 6,
"Effects": "",
@ -32877,7 +32877,7 @@
"key": "equip_equip_suitintr_672",
"text": "控制型秘宝"
},
"pos": 7,
"pos": 6,
"initLv": 6,
"color": 6,
"Effects": "",
@ -32924,7 +32924,7 @@
"key": "equip_equip_suitintr_673",
"text": "火的热情护身符"
},
"pos": 8,
"pos": 7,
"initLv": 1,
"color": 1,
"Effects": "",
@ -32973,7 +32973,7 @@
"key": "equip_equip_suitintr_674",
"text": "林的感观护身符"
},
"pos": 8,
"pos": 7,
"initLv": 1,
"color": 1,
"Effects": "",
@ -33022,7 +33022,7 @@
"key": "equip_equip_suitintr_675",
"text": "水的包容护身符"
},
"pos": 8,
"pos": 7,
"initLv": 1,
"color": 1,
"Effects": "",
@ -33071,7 +33071,7 @@
"key": "equip_equip_suitintr_676",
"text": "光的荣耀护身符"
},
"pos": 8,
"pos": 7,
"initLv": 1,
"color": 1,
"Effects": "",
@ -33120,7 +33120,7 @@
"key": "equip_equip_suitintr_677",
"text": "火的热情护身符"
},
"pos": 8,
"pos": 7,
"initLv": 2,
"color": 2,
"Effects": "",
@ -33169,7 +33169,7 @@
"key": "equip_equip_suitintr_678",
"text": "林的感观护身符"
},
"pos": 8,
"pos": 7,
"initLv": 2,
"color": 2,
"Effects": "",
@ -33218,7 +33218,7 @@
"key": "equip_equip_suitintr_679",
"text": "水的包容护身符"
},
"pos": 8,
"pos": 7,
"initLv": 2,
"color": 2,
"Effects": "",
@ -33267,7 +33267,7 @@
"key": "equip_equip_suitintr_680",
"text": "光的荣耀护身符"
},
"pos": 8,
"pos": 7,
"initLv": 2,
"color": 2,
"Effects": "",
@ -33316,7 +33316,7 @@
"key": "equip_equip_suitintr_681",
"text": "火的热情护身符"
},
"pos": 8,
"pos": 7,
"initLv": 3,
"color": 3,
"Effects": "",
@ -33365,7 +33365,7 @@
"key": "equip_equip_suitintr_682",
"text": "林的感观护身符"
},
"pos": 8,
"pos": 7,
"initLv": 3,
"color": 3,
"Effects": "",
@ -33414,7 +33414,7 @@
"key": "equip_equip_suitintr_683",
"text": "水的包容护身符"
},
"pos": 8,
"pos": 7,
"initLv": 3,
"color": 3,
"Effects": "",
@ -33463,7 +33463,7 @@
"key": "equip_equip_suitintr_684",
"text": "光的荣耀护身符"
},
"pos": 8,
"pos": 7,
"initLv": 3,
"color": 3,
"Effects": "",
@ -33512,7 +33512,7 @@
"key": "equip_equip_suitintr_685",
"text": "火的热情护身符"
},
"pos": 8,
"pos": 7,
"initLv": 4,
"color": 4,
"Effects": "",
@ -33561,7 +33561,7 @@
"key": "equip_equip_suitintr_686",
"text": "林的感观护身符"
},
"pos": 8,
"pos": 7,
"initLv": 4,
"color": 4,
"Effects": "",
@ -33610,7 +33610,7 @@
"key": "equip_equip_suitintr_687",
"text": "水的包容护身符"
},
"pos": 8,
"pos": 7,
"initLv": 4,
"color": 4,
"Effects": "",
@ -33659,7 +33659,7 @@
"key": "equip_equip_suitintr_688",
"text": "光的荣耀护身符"
},
"pos": 8,
"pos": 7,
"initLv": 4,
"color": 4,
"Effects": "",
@ -33708,7 +33708,7 @@
"key": "equip_equip_suitintr_689",
"text": "火的热情护身符"
},
"pos": 8,
"pos": 7,
"initLv": 5,
"color": 5,
"Effects": "",
@ -33755,7 +33755,7 @@
"key": "equip_equip_suitintr_690",
"text": "林的感观护身符"
},
"pos": 8,
"pos": 7,
"initLv": 5,
"color": 5,
"Effects": "",
@ -33802,7 +33802,7 @@
"key": "equip_equip_suitintr_691",
"text": "水的包容护身符"
},
"pos": 8,
"pos": 7,
"initLv": 5,
"color": 5,
"Effects": "",
@ -33849,7 +33849,7 @@
"key": "equip_equip_suitintr_692",
"text": "光的荣耀护身符"
},
"pos": 8,
"pos": 7,
"initLv": 5,
"color": 5,
"Effects": "",
@ -33896,7 +33896,7 @@
"key": "equip_equip_suitintr_693",
"text": "火的热情护身符"
},
"pos": 8,
"pos": 7,
"initLv": 6,
"color": 6,
"Effects": "",
@ -33943,7 +33943,7 @@
"key": "equip_equip_suitintr_694",
"text": "林的感观护身符"
},
"pos": 8,
"pos": 7,
"initLv": 6,
"color": 6,
"Effects": "",
@ -33990,7 +33990,7 @@
"key": "equip_equip_suitintr_695",
"text": "水的包容护身符"
},
"pos": 8,
"pos": 7,
"initLv": 6,
"color": 6,
"Effects": "",
@ -34037,7 +34037,7 @@
"key": "equip_equip_suitintr_696",
"text": "光的荣耀护身符"
},
"pos": 8,
"pos": 7,
"initLv": 6,
"color": 6,
"Effects": "",

40
modules/equipment/api_equip.go
View File

@ -74,7 +74,6 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
this.module.Errorf("Equip_Check err:%v", err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
@ -86,14 +85,26 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
if equipments[i].Lv < minlv {
minlv = equipments[i].Lv
}
if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
lvnum[equipments[i].Lv]++
for k, _ := range lvnum {
if k > equipments[i].Lv {
lvnum[k]++
}
}
if confs[i].Suittype > 0 {
if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: fmt.Sprintf("%s-err:%s", confs[i].Id, err.Error()),
}
return
}
} else {
continue
}
suit = nil
for _, _suit := range suits {
if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装
@ -102,13 +113,6 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
}
}
lvnum[equipments[i].Lv]++
for k, _ := range lvnum {
if k > equipments[i].Lv {
lvnum[k]++
}
}
if suit == nil {
suit = &pb.DB_EquipmentSuit{
Suitid: confs[i].Suittype,
@ -157,7 +161,6 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -170,7 +173,6 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
this.module.Errorf("Equip reader uid:%s equipment:%s err:%v", session.GetUserId(), v, err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
@ -189,10 +191,11 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
for i, v := range equipments { //校验装备位置
if v != nil {
if i != int(confs[i].Pos) {
this.module.Errorf("Equip conf:%+v Target:%d Incorrect range!", confs[i], i)
err = fmt.Errorf("Equip conf:%+v Target:%d Incorrect range!", confs[i], i)
this.module.Errorln(err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Code: pb.ErrorCode_SystemError,
Message: err.Error(),
}
return
}
@ -213,7 +216,6 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
this.module.Errorf("Equip err%v", err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return

27
modules/equipment/api_upgrade.go
View File

@ -209,25 +209,32 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
}
return
}
if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
if confs[i].Suittype > 0 {
if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
}
}
} else {
equipments[i] = equipment
confs[i] = conf
if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
if confs[i].Suittype > 0 {
if suitconfs[i], err = this.module.configure.getEquipSuit(confs[i].Suittype); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
}
}
}
if confs[i].Suittype == 0 {
continue
}
suit = nil
for _, _suit := range suits {
if _suit.Suitid == confs[i].Suittype && !_suit.Effect { //找到一个未生效的套装

1
modules/viking/comp_configure.go
View File

@ -148,5 +148,4 @@ func (this *configureComp) GetGameSweepData(id int32, round int32) (conf *cfg.Ga
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_sweep, id)
return
}
return
}

1
sys/configure/structs/TEnum.EEquipPos.go
View File

@ -18,5 +18,4 @@ const (
TEnumEEquipPos_Five = 5
TEnumEEquipPos_Six = 6
TEnumEEquipPos_Seven = 7
TEnumEEquipPos_Eight = 8
)