diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index a6e76d435..f96654c4f 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -376,7 +376,7 @@ "main": [ { "key": 1, - "param": 1 + "param": 9999 } ], "wkqbx": 0, @@ -399,7 +399,7 @@ "main": [ { "key": 1, - "param": 1 + "param": 9999 } ], "wkqbx": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 147f227c0..fe951502b 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -2008,8 +2008,8 @@ "901" ], "event": [ - 2, - 10990 + 1, + 110 ], "goto": 0 }, diff --git a/bin/json/game_smithyatlasscore.json b/bin/json/game_smithyatlasscore.json index 077a6adb9..b8c7f48e0 100644 --- a/bin/json/game_smithyatlasscore.json +++ b/bin/json/game_smithyatlasscore.json @@ -1,218 +1,182 @@ [ { "id": 1, - "quality": 1, "initLv": 1, + "entry_num": 0, "score": 1 }, { "id": 2, - "quality": 1, - "initLv": 2, + "initLv": 1, + "entry_num": 1, "score": 2 }, { "id": 3, - "quality": 1, - "initLv": 3, + "initLv": 1, + "entry_num": 3, "score": 3 }, { "id": 4, - "quality": 1, - "initLv": 4, + "initLv": 1, + "entry_num": 4, "score": 4 }, { "id": 5, - "quality": 1, - "initLv": 5, + "initLv": 1, + "entry_num": 5, "score": 5 }, { "id": 6, - "quality": 1, - "initLv": 6, - "score": 6 - }, - { - "id": 7, - "quality": 2, - "initLv": 1, + "initLv": 2, + "entry_num": 0, "score": 7 }, { - "id": 8, - "quality": 2, + "id": 7, "initLv": 2, + "entry_num": 1, "score": 8 }, { - "id": 9, - "quality": 2, - "initLv": 3, + "id": 8, + "initLv": 2, + "entry_num": 3, "score": 9 }, { - "id": 10, - "quality": 2, - "initLv": 4, + "id": 9, + "initLv": 2, + "entry_num": 4, "score": 10 }, { - "id": 11, - "quality": 2, - "initLv": 5, + "id": 10, + "initLv": 2, + "entry_num": 5, "score": 11 }, { - "id": 12, - "quality": 2, - "initLv": 6, + "id": 11, + "initLv": 3, + "entry_num": 0, "score": 12 }, { - "id": 13, - "quality": 3, - "initLv": 1, + "id": 12, + "initLv": 3, + "entry_num": 1, "score": 13 }, { - "id": 14, - "quality": 3, - "initLv": 2, + "id": 13, + "initLv": 3, + "entry_num": 3, "score": 14 }, { - "id": 15, - "quality": 3, + "id": 14, "initLv": 3, + "entry_num": 4, "score": 15 }, { - "id": 16, - "quality": 3, - "initLv": 4, + "id": 15, + "initLv": 3, + "entry_num": 5, "score": 16 }, { - "id": 17, - "quality": 3, - "initLv": 5, + "id": 16, + "initLv": 4, + "entry_num": 0, "score": 17 }, { - "id": 18, - "quality": 3, - "initLv": 6, + "id": 17, + "initLv": 4, + "entry_num": 1, "score": 18 }, { - "id": 19, - "quality": 4, - "initLv": 1, + "id": 18, + "initLv": 4, + "entry_num": 3, "score": 19 }, { - "id": 20, - "quality": 4, - "initLv": 2, + "id": 19, + "initLv": 4, + "entry_num": 4, "score": 20 }, { - "id": 21, - "quality": 4, - "initLv": 3, + "id": 20, + "initLv": 4, + "entry_num": 5, "score": 21 }, { - "id": 22, - "quality": 4, - "initLv": 4, + "id": 21, + "initLv": 5, + "entry_num": 0, "score": 22 }, { - "id": 23, - "quality": 4, + "id": 22, "initLv": 5, + "entry_num": 1, "score": 23 }, { - "id": 24, - "quality": 4, - "initLv": 6, + "id": 23, + "initLv": 5, + "entry_num": 3, "score": 24 }, { - "id": 25, - "quality": 5, - "initLv": 1, + "id": 24, + "initLv": 5, + "entry_num": 4, "score": 25 }, { - "id": 26, - "quality": 5, - "initLv": 2, + "id": 25, + "initLv": 5, + "entry_num": 5, "score": 26 }, { - "id": 27, - "quality": 5, - "initLv": 3, + "id": 26, + "initLv": 6, + "entry_num": 0, "score": 27 }, { - "id": 28, - "quality": 5, - "initLv": 4, + "id": 27, + "initLv": 6, + "entry_num": 1, "score": 28 }, { - "id": 29, - "quality": 5, - "initLv": 5, + "id": 28, + "initLv": 6, + "entry_num": 3, "score": 29 }, { - "id": 30, - "quality": 5, + "id": 29, "initLv": 6, + "entry_num": 4, "score": 30 }, { - "id": 31, - "quality": 6, - "initLv": 1, - "score": 31 - }, - { - "id": 32, - "quality": 6, - "initLv": 2, - "score": 32 - }, - { - "id": 33, - "quality": 6, - "initLv": 3, - "score": 33 - }, - { - "id": 34, - "quality": 6, - "initLv": 4, - "score": 34 - }, - { - "id": 35, - "quality": 6, - "initLv": 5, - "score": 35 - }, - { - "id": 36, - "quality": 6, + "id": 30, "initLv": 6, - "score": 36 + "entry_num": 5, + "score": 31 } ] \ No newline at end of file diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 9d581de75..338867bd0 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -312,7 +312,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq if equipConf := this.module.configure.GetEquipmentConfigureById(v.CId); equipConf != nil { // 获取装备等级 go func(cid string, star int32, AdverbEntry int32) { this.module.modelAtlas.CheckActivateAtlas(session.GetUserId(), cid, star, AdverbEntry, stove.Forge[req.ReelId]) - }(v.CId, equipConf.InitLv, int32(len(v.AdverbEntry)+1)) // 品质按副词条数+1 来算 + }(v.CId, equipConf.InitLv, int32(len(v.AdverbEntry))) // 品质按副词条数+1 来算 } } var equip map[int32]int32 // key xingji value 数量 diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go index 2c75ce764..35d4c1d81 100644 --- a/modules/smithy/comp_configure.go +++ b/modules/smithy/comp_configure.go @@ -278,7 +278,7 @@ func (this *configureComp) LoadSmithyAtlasScoreConf() { this._mapAtlasScore = make(map[int64]int32, 0) defer this.hlock.Unlock() for _, value := range configure.GetDataList() { - this._mapAtlasScore[int64(value.Quality<<16)+int64(value.InitLv)] = value.Score + this._mapAtlasScore[int64(value.InitLv<<16)+int64(value.EntryNum)] = value.Score } return } diff --git a/modules/smithy/model_atlas.go b/modules/smithy/model_atlas.go index 225ae9cc3..34bb5ad5f 100644 --- a/modules/smithy/model_atlas.go +++ b/modules/smithy/model_atlas.go @@ -64,9 +64,14 @@ func (this *modelAtlas) CheckActivateAtlas(uid string, id string, lv int32, qual list *pb.DBAtlas err error ) - if atlasConf, err = this.module.configure.GetSmithyAtlasConf(id); err != nil { - return false + // 装备id 转图鉴id + if conf := this.module.configure.GetEquipmentConfigureById(id); conf != nil { + + if atlasConf, err = this.module.configure.GetSmithyAtlasConf(conf.AtlasId); err != nil { + return false + } } + if list, err = this.module.modelAtlas.getSmithyAtlasList(uid); err != nil { return false } diff --git a/sys/configure/structs/Game.SmithyAtlasScoreData.go b/sys/configure/structs/Game.SmithyAtlasScoreData.go index d58726942..2ef5f1b78 100644 --- a/sys/configure/structs/Game.SmithyAtlasScoreData.go +++ b/sys/configure/structs/Game.SmithyAtlasScoreData.go @@ -12,8 +12,8 @@ import "errors" type GameSmithyAtlasScoreData struct { Id int32 - Quality int32 InitLv int32 + EntryNum int32 Score int32 } @@ -25,8 +25,8 @@ func (*GameSmithyAtlasScoreData) GetTypeId() int32 { func (_v *GameSmithyAtlasScoreData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["quality"].(float64); !_ok_ { err = errors.New("quality error"); return }; _v.Quality = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initLv"].(float64); !_ok_ { err = errors.New("initLv error"); return }; _v.InitLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["entry_num"].(float64); !_ok_ { err = errors.New("entry_num error"); return }; _v.EntryNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) } return }