From 2555cda2395226c73c03bbbb11888b1e381f91f9 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 14 Mar 2024 10:28:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=93=E6=AD=A6=E5=8D=87?= =?UTF-8?q?=E9=98=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_exclusiverank.json | 95 +++++- bin/json/game_exclusivestar.json | 54 +++- bin/json/game_exclusiveupgrade.json | 300 +++++++++--------- bin/json/game_worldtask.json | 12 +- modules/exclusive/api_rankup.go | 3 + .../structs/Game.ExclusiveRankData.go | 30 ++ .../structs/Game.ExclusiveStarData.go | 8 +- 7 files changed, 336 insertions(+), 166 deletions(-) diff --git a/bin/json/game_exclusiverank.json b/bin/json/game_exclusiverank.json index df8c9b335..703cfa4ec 100644 --- a/bin/json/game_exclusiverank.json +++ b/bin/json/game_exclusiverank.json @@ -15,6 +15,23 @@ "t": "13000001", "n": 100 } + ], + "attribute": [ + { + "a": 56, + "n": 245 + }, + { + "a": 53, + "n": 3800 + } + ], + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 100 + } ] }, { @@ -33,6 +50,23 @@ "t": "13000001", "n": 200 } + ], + "attribute": [ + { + "a": 56, + "n": 395 + }, + { + "a": 53, + "n": 6800 + } + ], + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 200 + } ] }, { @@ -51,6 +85,23 @@ "t": "13000001", "n": 300 } + ], + "attribute": [ + { + "a": 56, + "n": 545 + }, + { + "a": 53, + "n": 9800 + } + ], + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 300 + } ] }, { @@ -69,6 +120,23 @@ "t": "13000001", "n": 400 } + ], + "attribute": [ + { + "a": 56, + "n": 695 + }, + { + "a": 53, + "n": 12000 + } + ], + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 400 + } ] }, { @@ -87,6 +155,23 @@ "t": "13000001", "n": 500 } + ], + "attribute": [ + { + "a": 56, + "n": 875 + }, + { + "a": 53, + "n": 15000 + } + ], + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } ] }, { @@ -94,6 +179,14 @@ "weaponid": "14003501", "rank": 6, "lvmax": 60, - "cost": [] + "cost": [], + "attribute": [], + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 600 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_exclusivestar.json b/bin/json/game_exclusivestar.json index abada91d5..cb6ea5c83 100644 --- a/bin/json/game_exclusivestar.json +++ b/bin/json/game_exclusivestar.json @@ -5,7 +5,13 @@ "star": 1, "commonskill": 913002431, "exclusiveskill": 913003433, - "cost1": [] + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 100 + } + ] }, { "id": 2, @@ -13,7 +19,13 @@ "star": 2, "commonskill": 913002431, "exclusiveskill": 913003433, - "cost1": [] + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 200 + } + ] }, { "id": 3, @@ -21,7 +33,13 @@ "star": 3, "commonskill": 913002431, "exclusiveskill": 913003433, - "cost1": [] + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 300 + } + ] }, { "id": 4, @@ -29,7 +47,13 @@ "star": 4, "commonskill": 913002431, "exclusiveskill": 913003433, - "cost1": [] + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 400 + } + ] }, { "id": 5, @@ -37,6 +61,26 @@ "star": 5, "commonskill": 913002431, "exclusiveskill": 913003433, - "cost1": [] + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ] + }, + { + "id": 6, + "weaponid": "14003501", + "star": 6, + "commonskill": 913002431, + "exclusiveskill": 913003433, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 600 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_exclusiveupgrade.json b/bin/json/game_exclusiveupgrade.json index e084eaacb..c0daf8d1d 100644 --- a/bin/json/game_exclusiveupgrade.json +++ b/bin/json/game_exclusiveupgrade.json @@ -246,14 +246,14 @@ "attribute": [ { "a": 56, - "n": 150 + "n": 250 }, { "a": 53, - "n": 3000 + "n": 4000 } ], - "needexp": 3000, + "needexp": 3200, "cost": [ { "a": "attr", @@ -270,14 +270,14 @@ "attribute": [ { "a": 56, - "n": 155 + "n": 255 }, { "a": 53, - "n": 3200 + "n": 4200 } ], - "needexp": 3200, + "needexp": 3400, "cost": [ { "a": "attr", @@ -294,14 +294,14 @@ "attribute": [ { "a": 56, - "n": 160 + "n": 260 }, { "a": 53, - "n": 3400 + "n": 4400 } ], - "needexp": 3400, + "needexp": 3600, "cost": [ { "a": "attr", @@ -318,14 +318,14 @@ "attribute": [ { "a": 56, - "n": 165 + "n": 265 }, { "a": 53, - "n": 3600 + "n": 4600 } ], - "needexp": 3600, + "needexp": 3800, "cost": [ { "a": "attr", @@ -342,14 +342,14 @@ "attribute": [ { "a": 56, - "n": 170 + "n": 270 }, { "a": 53, - "n": 3800 + "n": 4800 } ], - "needexp": 3800, + "needexp": 4000, "cost": [ { "a": "attr", @@ -366,14 +366,14 @@ "attribute": [ { "a": 56, - "n": 175 + "n": 275 }, { "a": 53, - "n": 4000 + "n": 5000 } ], - "needexp": 4000, + "needexp": 4200, "cost": [ { "a": "attr", @@ -390,14 +390,14 @@ "attribute": [ { "a": 56, - "n": 180 + "n": 280 }, { "a": 53, - "n": 4200 + "n": 5200 } ], - "needexp": 4200, + "needexp": 4400, "cost": [ { "a": "attr", @@ -414,14 +414,14 @@ "attribute": [ { "a": 56, - "n": 185 + "n": 285 }, { "a": 53, - "n": 4400 + "n": 5400 } ], - "needexp": 4400, + "needexp": 4600, "cost": [ { "a": "attr", @@ -438,14 +438,14 @@ "attribute": [ { "a": 56, - "n": 190 + "n": 290 }, { "a": 53, - "n": 4600 + "n": 5600 } ], - "needexp": 4600, + "needexp": 4800, "cost": [ { "a": "attr", @@ -462,14 +462,14 @@ "attribute": [ { "a": 56, - "n": 195 + "n": 295 }, { "a": 53, - "n": 4800 + "n": 5800 } ], - "needexp": 4800, + "needexp": 5000, "cost": [ { "a": "attr", @@ -486,14 +486,14 @@ "attribute": [ { "a": 56, - "n": 200 + "n": 400 }, { "a": 53, - "n": 5000 + "n": 7000 } ], - "needexp": 5000, + "needexp": 5400, "cost": [ { "a": "attr", @@ -510,14 +510,14 @@ "attribute": [ { "a": 56, - "n": 205 + "n": 405 }, { "a": 53, - "n": 5200 + "n": 7200 } ], - "needexp": 5200, + "needexp": 5600, "cost": [ { "a": "attr", @@ -534,14 +534,14 @@ "attribute": [ { "a": 56, - "n": 210 + "n": 410 }, { "a": 53, - "n": 5400 + "n": 7400 } ], - "needexp": 5400, + "needexp": 5800, "cost": [ { "a": "attr", @@ -558,14 +558,14 @@ "attribute": [ { "a": 56, - "n": 215 + "n": 415 }, { "a": 53, - "n": 5600 + "n": 7600 } ], - "needexp": 5600, + "needexp": 6000, "cost": [ { "a": "attr", @@ -582,14 +582,14 @@ "attribute": [ { "a": 56, - "n": 220 + "n": 420 }, { "a": 53, - "n": 5800 + "n": 7800 } ], - "needexp": 5800, + "needexp": 6200, "cost": [ { "a": "attr", @@ -606,14 +606,14 @@ "attribute": [ { "a": 56, - "n": 225 + "n": 425 }, { "a": 53, - "n": 6000 + "n": 8000 } ], - "needexp": 6000, + "needexp": 6400, "cost": [ { "a": "attr", @@ -630,14 +630,14 @@ "attribute": [ { "a": 56, - "n": 230 + "n": 430 }, { "a": 53, - "n": 6200 + "n": 8200 } ], - "needexp": 6200, + "needexp": 6600, "cost": [ { "a": "attr", @@ -654,14 +654,14 @@ "attribute": [ { "a": 56, - "n": 235 + "n": 435 }, { "a": 53, - "n": 6400 + "n": 8400 } ], - "needexp": 6400, + "needexp": 6800, "cost": [ { "a": "attr", @@ -678,14 +678,14 @@ "attribute": [ { "a": 56, - "n": 240 + "n": 440 }, { "a": 53, - "n": 6600 + "n": 8600 } ], - "needexp": 6600, + "needexp": 7000, "cost": [ { "a": "attr", @@ -702,14 +702,14 @@ "attribute": [ { "a": 56, - "n": 245 + "n": 445 }, { "a": 53, - "n": 6800 + "n": 8800 } ], - "needexp": 6800, + "needexp": 7200, "cost": [ { "a": "attr", @@ -726,14 +726,14 @@ "attribute": [ { "a": 56, - "n": 250 + "n": 550 }, { "a": 53, - "n": 7000 + "n": 10000 } ], - "needexp": 7000, + "needexp": 7600, "cost": [ { "a": "attr", @@ -750,14 +750,14 @@ "attribute": [ { "a": 56, - "n": 255 + "n": 555 }, { "a": 53, - "n": 7200 + "n": 10200 } ], - "needexp": 7200, + "needexp": 7800, "cost": [ { "a": "attr", @@ -774,14 +774,14 @@ "attribute": [ { "a": 56, - "n": 260 + "n": 560 }, { "a": 53, - "n": 7400 + "n": 10400 } ], - "needexp": 7400, + "needexp": 8000, "cost": [ { "a": "attr", @@ -798,14 +798,14 @@ "attribute": [ { "a": 56, - "n": 265 + "n": 565 }, { "a": 53, - "n": 7600 + "n": 10600 } ], - "needexp": 7600, + "needexp": 8200, "cost": [ { "a": "attr", @@ -822,14 +822,14 @@ "attribute": [ { "a": 56, - "n": 270 + "n": 570 }, { "a": 53, - "n": 7800 + "n": 10800 } ], - "needexp": 7800, + "needexp": 8400, "cost": [ { "a": "attr", @@ -846,14 +846,14 @@ "attribute": [ { "a": 56, - "n": 275 + "n": 575 }, { "a": 53, - "n": 8000 + "n": 11000 } ], - "needexp": 8000, + "needexp": 8600, "cost": [ { "a": "attr", @@ -870,14 +870,14 @@ "attribute": [ { "a": 56, - "n": 280 + "n": 580 }, { "a": 53, - "n": 8200 + "n": 11200 } ], - "needexp": 8200, + "needexp": 8800, "cost": [ { "a": "attr", @@ -894,14 +894,14 @@ "attribute": [ { "a": 56, - "n": 285 + "n": 585 }, { "a": 53, - "n": 8400 + "n": 11400 } ], - "needexp": 8400, + "needexp": 9000, "cost": [ { "a": "attr", @@ -918,14 +918,14 @@ "attribute": [ { "a": 56, - "n": 290 + "n": 590 }, { "a": 53, - "n": 8600 + "n": 11600 } ], - "needexp": 8600, + "needexp": 9200, "cost": [ { "a": "attr", @@ -942,14 +942,14 @@ "attribute": [ { "a": 56, - "n": 295 + "n": 595 }, { "a": 53, - "n": 8800 + "n": 11800 } ], - "needexp": 8800, + "needexp": 9400, "cost": [ { "a": "attr", @@ -966,14 +966,14 @@ "attribute": [ { "a": 56, - "n": 300 + "n": 700 }, { "a": 53, - "n": 9000 + "n": 12200 } ], - "needexp": 9000, + "needexp": 9800, "cost": [ { "a": "attr", @@ -990,14 +990,14 @@ "attribute": [ { "a": 56, - "n": 305 + "n": 705 }, { "a": 53, - "n": 9200 + "n": 12400 } ], - "needexp": 9200, + "needexp": 10000, "cost": [ { "a": "attr", @@ -1014,14 +1014,14 @@ "attribute": [ { "a": 56, - "n": 310 + "n": 710 }, { "a": 53, - "n": 9400 + "n": 12600 } ], - "needexp": 9400, + "needexp": 10200, "cost": [ { "a": "attr", @@ -1038,14 +1038,14 @@ "attribute": [ { "a": 56, - "n": 315 + "n": 715 }, { "a": 53, - "n": 9600 + "n": 12800 } ], - "needexp": 9600, + "needexp": 10400, "cost": [ { "a": "attr", @@ -1062,14 +1062,14 @@ "attribute": [ { "a": 56, - "n": 320 + "n": 720 }, { "a": 53, - "n": 9800 + "n": 13000 } ], - "needexp": 9800, + "needexp": 10600, "cost": [ { "a": "attr", @@ -1086,14 +1086,14 @@ "attribute": [ { "a": 56, - "n": 325 + "n": 725 }, { "a": 53, - "n": 10000 + "n": 13200 } ], - "needexp": 10000, + "needexp": 10800, "cost": [ { "a": "attr", @@ -1110,14 +1110,14 @@ "attribute": [ { "a": 56, - "n": 330 + "n": 730 }, { "a": 53, - "n": 10200 + "n": 13400 } ], - "needexp": 10200, + "needexp": 11000, "cost": [ { "a": "attr", @@ -1134,14 +1134,14 @@ "attribute": [ { "a": 56, - "n": 335 + "n": 735 }, { "a": 53, - "n": 10400 + "n": 13600 } ], - "needexp": 10400, + "needexp": 11200, "cost": [ { "a": "attr", @@ -1158,14 +1158,14 @@ "attribute": [ { "a": 56, - "n": 340 + "n": 740 }, { "a": 53, - "n": 10600 + "n": 13800 } ], - "needexp": 10600, + "needexp": 11400, "cost": [ { "a": "attr", @@ -1182,14 +1182,14 @@ "attribute": [ { "a": 56, - "n": 345 + "n": 745 }, { "a": 53, - "n": 10800 + "n": 14000 } ], - "needexp": 10800, + "needexp": 11600, "cost": [ { "a": "attr", @@ -1206,14 +1206,14 @@ "attribute": [ { "a": 56, - "n": 350 + "n": 880 }, { "a": 53, - "n": 11000 + "n": 15200 } ], - "needexp": 11000, + "needexp": 12000, "cost": [ { "a": "attr", @@ -1230,14 +1230,14 @@ "attribute": [ { "a": 56, - "n": 355 + "n": 885 }, { "a": 53, - "n": 11200 + "n": 15400 } ], - "needexp": 11200, + "needexp": 12200, "cost": [ { "a": "attr", @@ -1254,14 +1254,14 @@ "attribute": [ { "a": 56, - "n": 360 + "n": 890 }, { "a": 53, - "n": 11400 + "n": 15600 } ], - "needexp": 11400, + "needexp": 12400, "cost": [ { "a": "attr", @@ -1278,14 +1278,14 @@ "attribute": [ { "a": 56, - "n": 365 + "n": 895 }, { "a": 53, - "n": 11600 + "n": 15800 } ], - "needexp": 11600, + "needexp": 12600, "cost": [ { "a": "attr", @@ -1302,14 +1302,14 @@ "attribute": [ { "a": 56, - "n": 370 + "n": 900 }, { "a": 53, - "n": 11800 + "n": 16000 } ], - "needexp": 11800, + "needexp": 12800, "cost": [ { "a": "attr", @@ -1326,14 +1326,14 @@ "attribute": [ { "a": 56, - "n": 375 + "n": 905 }, { "a": 53, - "n": 12000 + "n": 16200 } ], - "needexp": 12000, + "needexp": 13000, "cost": [ { "a": "attr", @@ -1350,14 +1350,14 @@ "attribute": [ { "a": 56, - "n": 380 + "n": 910 }, { "a": 53, - "n": 12200 + "n": 16400 } ], - "needexp": 12200, + "needexp": 13200, "cost": [ { "a": "attr", @@ -1374,14 +1374,14 @@ "attribute": [ { "a": 56, - "n": 385 + "n": 915 }, { "a": 53, - "n": 12400 + "n": 16600 } ], - "needexp": 12400, + "needexp": 13400, "cost": [ { "a": "attr", @@ -1398,14 +1398,14 @@ "attribute": [ { "a": 56, - "n": 390 + "n": 920 }, { "a": 53, - "n": 12600 + "n": 16800 } ], - "needexp": 12600, + "needexp": 13600, "cost": [ { "a": "attr", @@ -1422,14 +1422,14 @@ "attribute": [ { "a": 56, - "n": 395 + "n": 925 }, { "a": 53, - "n": 12800 + "n": 17000 } ], - "needexp": 12800, + "needexp": 13800, "cost": [ { "a": "attr", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index e98849acf..5a27f5779 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -9297,7 +9297,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 320390, + "npc": 320380, "completetask": [ 14000110 ], @@ -9340,7 +9340,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 320400, + "npc": 320380, "completetask": [ 14000120 ], @@ -9383,7 +9383,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 320410, + "npc": 320380, "completetask": [ 14000130 ], @@ -9426,7 +9426,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 320420, + "npc": 320380, "completetask": [ 14000140 ], @@ -9469,7 +9469,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 320430, + "npc": 320380, "completetask": [ 14000150 ], @@ -9512,7 +9512,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 320440, + "npc": 320380, "completetask": [ 14000160 ], diff --git a/modules/exclusive/api_rankup.go b/modules/exclusive/api_rankup.go index 10fc5df38..d394b7eda 100644 --- a/modules/exclusive/api_rankup.go +++ b/modules/exclusive/api_rankup.go @@ -40,6 +40,9 @@ func (this *apiComp) RankUp(session comm.IUserSession, req *pb.ExclusiveRankUpRe return } info.Step += 1 + for _, v := range conf.Attribute { + info.Property[v.A] = v.N + } if err = this.module.model.updateExclusive(session.GetUserId(), info); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/sys/configure/structs/Game.ExclusiveRankData.go b/sys/configure/structs/Game.ExclusiveRankData.go index 66210fe79..209e42e48 100644 --- a/sys/configure/structs/Game.ExclusiveRankData.go +++ b/sys/configure/structs/Game.ExclusiveRankData.go @@ -16,6 +16,8 @@ type GameExclusiveRankData struct { Rank int32 Lvmax int32 Cost []*Gameatn + Attribute []*Gameatr + Sale []*Gameatn } const TypeId_GameExclusiveRankData = 1667489720 @@ -43,6 +45,34 @@ func (_v *GameExclusiveRankData)Deserialize(_buf map[string]interface{}) (err er } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["attribute"].([]interface{}); !_ok_ { err = errors.New("attribute error"); return } + + _v.Attribute = make([]*Gameatr, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatr + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatr(_x_); err != nil { return } } + _v.Attribute = append(_v.Attribute, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["sale"].([]interface{}); !_ok_ { err = errors.New("sale error"); return } + + _v.Sale = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Sale = append(_v.Sale, _list_v_) + } + } + return } diff --git a/sys/configure/structs/Game.ExclusiveStarData.go b/sys/configure/structs/Game.ExclusiveStarData.go index efef23693..7dff969e4 100644 --- a/sys/configure/structs/Game.ExclusiveStarData.go +++ b/sys/configure/structs/Game.ExclusiveStarData.go @@ -16,7 +16,7 @@ type GameExclusiveStarData struct { Star int32 Commonskill int32 Exclusiveskill int32 - Cost1 []*Gameatn + Sale []*Gameatn } const TypeId_GameExclusiveStarData = -1567680802 @@ -34,14 +34,14 @@ func (_v *GameExclusiveStarData)Deserialize(_buf map[string]interface{}) (err er { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["cost1"].([]interface{}); !_ok_ { err = errors.New("cost1 error"); return } + if _arr_, _ok_ = _buf["sale"].([]interface{}); !_ok_ { err = errors.New("sale error"); return } - _v.Cost1 = make([]*Gameatn, 0, len(_arr_)) + _v.Sale = make([]*Gameatn, 0, len(_arr_)) for _, _e_ := range _arr_ { var _list_v_ *Gameatn { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } - _v.Cost1 = append(_v.Cost1, _list_v_) + _v.Sale = append(_v.Sale, _list_v_) } }