diff --git a/bin/json/game_expeditionboss.json b/bin/json/game_expeditionboss.json index 421a75f5b..be8772b0e 100644 --- a/bin/json/game_expeditionboss.json +++ b/bin/json/game_expeditionboss.json @@ -9,7 +9,7 @@ "serial": 1, "fighting": 1000, "boss_img": 25002, - "kill_reward": 213, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -61,7 +61,7 @@ "serial": 2, "fighting": 1200, "boss_img": 15001, - "kill_reward": 214, + "kill_reward": 19100002, "fail_reward": [ { "a": "attr", @@ -113,7 +113,7 @@ "serial": 3, "fighting": 1440, "boss_img": 15002, - "kill_reward": 215, + "kill_reward": 19100003, "fail_reward": [ { "a": "attr", @@ -165,7 +165,7 @@ "serial": 4, "fighting": 1728, "boss_img": 15004, - "kill_reward": 216, + "kill_reward": 19100004, "fail_reward": [ { "a": "attr", @@ -217,7 +217,7 @@ "serial": 5, "fighting": 2073, "boss_img": 25003, - "kill_reward": 217, + "kill_reward": 19100005, "fail_reward": [ { "a": "attr", @@ -269,7 +269,7 @@ "serial": 6, "fighting": 2487, "boss_img": 35005, - "kill_reward": 218, + "kill_reward": 19100006, "fail_reward": [ { "a": "attr", @@ -321,7 +321,7 @@ "serial": 7, "fighting": 2984, "boss_img": 45001, - "kill_reward": 219, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -373,7 +373,7 @@ "serial": 1, "fighting": 3580, "boss_img": 25002, - "kill_reward": 213, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -425,7 +425,7 @@ "serial": 2, "fighting": 4296, "boss_img": 15001, - "kill_reward": 214, + "kill_reward": 19100002, "fail_reward": [ { "a": "attr", @@ -477,7 +477,7 @@ "serial": 3, "fighting": 5155, "boss_img": 15002, - "kill_reward": 215, + "kill_reward": 19100003, "fail_reward": [ { "a": "attr", @@ -529,7 +529,7 @@ "serial": 4, "fighting": 6186, "boss_img": 15004, - "kill_reward": 216, + "kill_reward": 19100004, "fail_reward": [ { "a": "attr", @@ -581,7 +581,7 @@ "serial": 5, "fighting": 7423, "boss_img": 25003, - "kill_reward": 217, + "kill_reward": 19100005, "fail_reward": [ { "a": "attr", @@ -633,7 +633,7 @@ "serial": 6, "fighting": 8907, "boss_img": 35005, - "kill_reward": 218, + "kill_reward": 19100006, "fail_reward": [ { "a": "attr", @@ -685,7 +685,7 @@ "serial": 7, "fighting": 0, "boss_img": 45001, - "kill_reward": 219, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -737,7 +737,7 @@ "serial": 1, "fighting": 0, "boss_img": 25002, - "kill_reward": 213, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -789,7 +789,7 @@ "serial": 2, "fighting": 0, "boss_img": 15001, - "kill_reward": 214, + "kill_reward": 19100002, "fail_reward": [ { "a": "attr", @@ -841,7 +841,7 @@ "serial": 3, "fighting": 0, "boss_img": 15002, - "kill_reward": 215, + "kill_reward": 19100003, "fail_reward": [ { "a": "attr", @@ -893,7 +893,7 @@ "serial": 4, "fighting": 0, "boss_img": 15004, - "kill_reward": 216, + "kill_reward": 19100004, "fail_reward": [ { "a": "attr", @@ -945,7 +945,7 @@ "serial": 5, "fighting": 0, "boss_img": 25003, - "kill_reward": 217, + "kill_reward": 19100005, "fail_reward": [ { "a": "attr", @@ -997,7 +997,7 @@ "serial": 6, "fighting": 0, "boss_img": 35005, - "kill_reward": 218, + "kill_reward": 19100006, "fail_reward": [ { "a": "attr", @@ -1049,7 +1049,7 @@ "serial": 7, "fighting": 0, "boss_img": 45001, - "kill_reward": 219, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -1101,7 +1101,7 @@ "serial": 1, "fighting": 0, "boss_img": 25002, - "kill_reward": 213, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -1153,7 +1153,7 @@ "serial": 2, "fighting": 0, "boss_img": 15001, - "kill_reward": 214, + "kill_reward": 19100002, "fail_reward": [ { "a": "attr", @@ -1205,7 +1205,7 @@ "serial": 3, "fighting": 0, "boss_img": 15002, - "kill_reward": 215, + "kill_reward": 19100003, "fail_reward": [ { "a": "attr", @@ -1257,7 +1257,7 @@ "serial": 4, "fighting": 0, "boss_img": 15004, - "kill_reward": 216, + "kill_reward": 19100004, "fail_reward": [ { "a": "attr", @@ -1309,7 +1309,7 @@ "serial": 5, "fighting": 0, "boss_img": 25003, - "kill_reward": 217, + "kill_reward": 19100005, "fail_reward": [ { "a": "attr", @@ -1361,7 +1361,7 @@ "serial": 6, "fighting": 0, "boss_img": 35005, - "kill_reward": 218, + "kill_reward": 19100006, "fail_reward": [ { "a": "attr", @@ -1413,7 +1413,7 @@ "serial": 7, "fighting": 0, "boss_img": 45001, - "kill_reward": 219, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -1465,7 +1465,7 @@ "serial": 1, "fighting": 0, "boss_img": 25002, - "kill_reward": 213, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", @@ -1517,7 +1517,7 @@ "serial": 2, "fighting": 0, "boss_img": 15001, - "kill_reward": 214, + "kill_reward": 19100002, "fail_reward": [ { "a": "attr", @@ -1569,7 +1569,7 @@ "serial": 3, "fighting": 0, "boss_img": 15002, - "kill_reward": 215, + "kill_reward": 19100003, "fail_reward": [ { "a": "attr", @@ -1621,7 +1621,7 @@ "serial": 4, "fighting": 0, "boss_img": 15004, - "kill_reward": 216, + "kill_reward": 19100004, "fail_reward": [ { "a": "attr", @@ -1673,7 +1673,7 @@ "serial": 5, "fighting": 0, "boss_img": 25003, - "kill_reward": 217, + "kill_reward": 19100005, "fail_reward": [ { "a": "attr", @@ -1725,7 +1725,7 @@ "serial": 6, "fighting": 0, "boss_img": 35005, - "kill_reward": 218, + "kill_reward": 19100006, "fail_reward": [ { "a": "attr", @@ -1777,7 +1777,7 @@ "serial": 7, "fighting": 0, "boss_img": 45001, - "kill_reward": 219, + "kill_reward": 19100001, "fail_reward": [ { "a": "attr", diff --git a/bin/json/game_systemstroytalk.json b/bin/json/game_systemstroytalk.json index 8a95aa09f..b46ac65a0 100644 --- a/bin/json/game_systemstroytalk.json +++ b/bin/json/game_systemstroytalk.json @@ -1,7 +1,7 @@ [ { "id": 1, - "opentime": 18000007, + "opentime": 18000010, "groupid": 1, "herohead": "tx_js_35002", "heroname": { @@ -12,7 +12,7 @@ }, { "id": 2, - "opentime": 18000012, + "opentime": 18000010, "groupid": 2, "herohead": "tx_js_14003", "heroname": { @@ -23,7 +23,7 @@ }, { "id": 3, - "opentime": 18000073, + "opentime": 18000010, "groupid": 3, "herohead": "tx_js_24008", "heroname": { @@ -34,7 +34,7 @@ }, { "id": 4, - "opentime": 18000092, + "opentime": 18000010, "groupid": 4, "herohead": "tx_js_15003", "heroname": { diff --git a/bin/timestamp.text b/bin/timestamp.text index cc765076d..8d58de5d7 100644 --- a/bin/timestamp.text +++ b/bin/timestamp.text @@ -1 +1 @@ -20000.000000 \ No newline at end of file +10000.000000 \ No newline at end of file diff --git a/modules/expedition/api_info.go b/modules/expedition/api_info.go index 3e1a1bd99..1a737a0b3 100644 --- a/modules/expedition/api_info.go +++ b/modules/expedition/api_info.go @@ -39,7 +39,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ExpeditionInfoReq) return } - if state == 2 || state == 3 { + if state == 3 { boos = info.Boos[info.Indexboos] if boos == nil { errdata = &pb.ErrorData{ diff --git a/modules/expedition/api_receive.go b/modules/expedition/api_receive.go index ade27e164..74d7bbb95 100644 --- a/modules/expedition/api_receive.go +++ b/modules/expedition/api_receive.go @@ -132,6 +132,6 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.ExpeditionReceiv return } - session.SendMsg(string(this.module.GetType()), "info", &pb.ExpeditionReceiveResp{Boosid: req.Boosid, Award: award}) + session.SendMsg(string(this.module.GetType()), "receive", &pb.ExpeditionReceiveResp{Boosid: req.Boosid, Award: award}) return }