diff --git a/bin/json/game_rdtask.json b/bin/json/game_rdtask.json index 8a1869aba..425a5f9d1 100644 --- a/bin/json/game_rdtask.json +++ b/bin/json/game_rdtask.json @@ -5,7 +5,7 @@ "type": 2, "preTid": 0, "condition": [ - 104 + 101 ], "sidequest": [ 1001, diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index 97bfdbcc1..823eeebfa 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -20,18 +20,38 @@ "nextTid": 100101, "reward": [ { - "a": "attr", - "t": "diamond", - "n": 33 + "ChooseId": 10001, + "Reward": [ + { + "a": "attr", + "t": "diamond", + "n": 33 + }, + { + "a": "attr", + "t": "diamond", + "n": 33 + } + ] }, { - "a": "attr", - "t": "gold", - "n": 33 + "ChooseId": 10002, + "Reward": [ + { + "a": "attr", + "t": "diamond", + "n": 33 + }, + { + "a": "attr", + "t": "diamond", + "n": 33 + } + ] } ], "CD": 0, - "endTid": 104 + "endTid": 101 }, { "id": 1002, @@ -47,11 +67,11 @@ "point": "model_04", "storyBegin": 2, "chooseId": [], - "storyEnd": 0, + "storyEnd": 1, "nextTid": -1, "reward": [], "CD": 0, - "endTid": -1 + "endTid": 104 }, { "id": 1003, diff --git a/cmd/v2/main.go b/cmd/v2/main.go index e56d9851e..a90513c1d 100644 --- a/cmd/v2/main.go +++ b/cmd/v2/main.go @@ -175,7 +175,7 @@ func checkVersion(app fyne.App, parent fyne.Window) { } oldVer := app.Metadata().Version - parent.SetTitle(fmt.Sprintf("传送门[%v]", oldVer)) + parent.SetTitle(fmt.Sprintf("传送门 v%v", oldVer)) ver := gjson.Get(string(b), "version").String() if strings.HasSuffix(ver, ".zip") { ver = strings.TrimSuffix(ver, ".zip") diff --git a/modules/rtask/api_choose.go b/modules/rtask/api_choose.go index df1694f9a..4c9003810 100644 --- a/modules/rtask/api_choose.go +++ b/modules/rtask/api_choose.go @@ -88,7 +88,11 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) ( return } // 发奖励 - code = this.moduleRtask.DispenseRes(session, sideConf.Reward, true) + for _, v := range sideConf.Reward { + if v.ChooseId == req.ChooseId { + code = this.moduleRtask.DispenseRes(session, v.Reward, true) + } + } rsp := &pb.RtaskFinishPush{ RtaskId: req.RtaskId, diff --git a/modules/rtask/api_dotask.go b/modules/rtask/api_dotask.go index e4de46720..31b9c7427 100644 --- a/modules/rtask/api_dotask.go +++ b/modules/rtask/api_dotask.go @@ -82,8 +82,6 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.RtaskApplyReq) (co code = pb.ErrorCode_SystemError } - // 发奖励 - code = this.moduleRtask.DispenseRes(session, sideConf.Reward, true) } else { // 校验完成条件 if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), sideConf.EndTid); !ok { diff --git a/modules/rtask/api_reward.go b/modules/rtask/api_reward.go index 83a2f7142..e88a3ee11 100644 --- a/modules/rtask/api_reward.go +++ b/modules/rtask/api_reward.go @@ -48,7 +48,9 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.RtaskGetReward } //发奖励 - code = this.moduleRtask.DispenseRes(session, sideConf.Reward, true) + for _, v := range sideConf.Reward { + code = this.moduleRtask.DispenseRes(session, v.Reward, true) + } update := map[string]interface{}{ "isReward": true, diff --git a/sys/configure/structs/Game.ChooseReward.go b/sys/configure/structs/Game.ChooseReward.go new file mode 100644 index 000000000..0170808d4 --- /dev/null +++ b/sys/configure/structs/Game.ChooseReward.go @@ -0,0 +1,50 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameChooseReward struct { + ChooseId int32 + Reward []*Gameatn +} + +const TypeId_GameChooseReward = -495619934 + +func (*GameChooseReward) GetTypeId() int32 { + return -495619934 +} + +func (_v *GameChooseReward)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ChooseId"].(float64); !_ok_ { err = errors.New("ChooseId error"); return }; _v.ChooseId = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["Reward"].([]interface{}); !_ok_ { err = errors.New("Reward error"); return } + + _v.Reward = 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.Reward = append(_v.Reward, _list_v_) + } + } + + return +} + +func DeserializeGameChooseReward(_buf map[string]interface{}) (*GameChooseReward, error) { + v := &GameChooseReward{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.RdtaskSideData.go b/sys/configure/structs/Game.RdtaskSideData.go index 6f5b1559b..feb14189e 100644 --- a/sys/configure/structs/Game.RdtaskSideData.go +++ b/sys/configure/structs/Game.RdtaskSideData.go @@ -23,7 +23,7 @@ type GameRdtaskSideData struct { ChooseId []int32 StoryEnd int32 NextTid int32 - Reward []*Gameatn + Reward []*GameChooseReward CD int32 EndTid int32 } @@ -71,11 +71,11 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error var _ok_ bool if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return } - _v.Reward = make([]*Gameatn, 0, len(_arr_)) + _v.Reward = make([]*GameChooseReward, 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 } } + var _list_v_ *GameChooseReward + { 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 = DeserializeGameChooseReward(_x_); err != nil { return } } _v.Reward = append(_v.Reward, _list_v_) } }