diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index 6daf0b5bb..94975b0a8 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -14,7 +14,14 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [ + { + "a": "item", + "t": "90001", + "n": 20 + } + ] }, { "key": 2, @@ -31,7 +38,14 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [ + { + "a": "item", + "t": "90001", + "n": 20 + } + ] }, { "key": 3, @@ -43,7 +57,14 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [ + { + "a": "item", + "t": "90001", + "n": 20 + } + ] }, { "key": 4, @@ -60,7 +81,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 5, @@ -77,7 +99,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 6, @@ -89,7 +112,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 7, @@ -106,7 +130,8 @@ ], "needracestar": 3, "needracenum": 3, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 8, @@ -123,7 +148,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 9, @@ -140,7 +166,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 10, @@ -152,7 +179,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 11, @@ -169,7 +197,8 @@ ], "needracestar": 3, "needracenum": 3, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 12, @@ -186,7 +215,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 13, @@ -203,7 +233,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 14, @@ -215,7 +246,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 15, @@ -232,7 +264,8 @@ ], "needracestar": 3, "needracenum": 3, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 16, @@ -249,7 +282,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 17, @@ -266,7 +300,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 18, @@ -278,7 +313,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 19, @@ -295,7 +331,8 @@ ], "needracestar": 3, "needracenum": 3, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 20, @@ -312,7 +349,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 21, @@ -329,7 +367,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 22, @@ -341,7 +380,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 23, @@ -358,7 +398,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 24, @@ -370,7 +411,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 25, @@ -387,7 +429,8 @@ ], "needracestar": 3, "needracenum": 3, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 26, @@ -404,7 +447,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 27, @@ -421,7 +465,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 28, @@ -433,7 +478,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 29, @@ -450,7 +496,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 30, @@ -467,7 +514,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 31, @@ -479,7 +527,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 32, @@ -496,7 +545,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 33, @@ -513,7 +563,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 34, @@ -525,7 +576,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 35, @@ -542,7 +594,8 @@ ], "needracestar": 3, "needracenum": 3, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 36, @@ -559,7 +612,8 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 37, @@ -576,7 +630,8 @@ ], "needracestar": 5, "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 38, @@ -588,7 +643,8 @@ "needrace": [], "needracestar": 0, "needracenum": 0, - "gold": 0 + "gold": 0, + "starup": [] }, { "key": 39, @@ -605,7 +661,8 @@ ], "needracestar": 3, "needracenum": 3, - "gold": 10000 + "gold": 10000, + "starup": [] }, { "key": 40, @@ -622,40 +679,7 @@ ], "needracestar": 4, "needracenum": 4, - "gold": 10000 - }, - { - "key": 41, - "id": "43901", - "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [ - 1, - 2, - 3, - 4 - ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000 - }, - { - "key": 42, - "id": "43902", - "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [ - 1, - 2, - 3, - 4 - ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000 + "gold": 10000, + "starup": [] } ] \ No newline at end of file diff --git a/modules/arena/api_challengereward.go b/modules/arena/api_challengereward.go index e202a30b5..b21230b98 100644 --- a/modules/arena/api_challengereward.go +++ b/modules/arena/api_challengereward.go @@ -62,8 +62,6 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha redstate = pb.BattleRecordState_RevengeSucceeded bulestate = pb.BattleRecordState_WaitingRevenge } - - session.SendMsg(string(this.module.GetType()), "challengereward", &pb.ArenaChallengeRewardResp{Issucc: true}) } else { if req.Revengeid != "" { redstate = pb.BattleRecordState_RevengeFailed @@ -78,7 +76,7 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha bulestate = pb.BattleRecordState_RevengeSucceeded } } - + session.SendMsg(string(this.module.GetType()), "challengereward", &pb.ArenaChallengeRewardResp{Issucc: true}) red = &pb.ArenaPlayer{ Uid: info.Uid, Name: info.Name, diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 9583fdbcc..cfd608092 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -129,6 +129,12 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr } chanegCard = append(chanegCard, CostHeroObj[k]) } + // 加对应的天赋点数 + if len(starConf.Starup) > 0 { + if code = this.module.DispenseRes(session, starConf.Starup, true); code != pb.ErrorCode_Success { // 加天赋点{ + this.module.Errorf("DispenseRes err:uid:%s,res:%v", session.GetUserId(), starConf.Starup) + } + } if _hero.SameCount > 1 { //有堆叠的情况 // 克隆一个新的 _hero.SameCount -= 1 diff --git a/sys/configure/structs/game.heroStarupData.go b/sys/configure/structs/game.heroStarupData.go index 31309d35d..718eec93f 100644 --- a/sys/configure/structs/game.heroStarupData.go +++ b/sys/configure/structs/game.heroStarupData.go @@ -21,6 +21,7 @@ type GameHeroStarupData struct { Needracestar int32 Needracenum int32 Gold int32 + Starup []*Gameatn } const TypeId_GameHeroStarupData = -1178048819 @@ -53,6 +54,20 @@ func (_v *GameHeroStarupData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracestar"].(float64); !_ok_ { err = errors.New("needracestar error"); return }; _v.Needracestar = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracenum"].(float64); !_ok_ { err = errors.New("needracenum error"); return }; _v.Needracenum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gold"].(float64); !_ok_ { err = errors.New("gold error"); return }; _v.Gold = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["starup"].([]interface{}); !_ok_ { err = errors.New("starup error"); return } + + _v.Starup = 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.Starup = append(_v.Starup, _list_v_) + } + } + return }