Compare commits

..

No commits in common. "e1f5447da066440f6d3c2f36d40a87283a6f80e7" and "ca5d442874b89101d6d6b40b2078a462ee47ada1" have entirely different histories.

9 changed files with 99 additions and 2976 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@ -11,7 +11,7 @@
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"100001": 500000, "100001": 500000,
"100004": 20 "100004": 5
}, },
"Position": [ "Position": [
1, 1,
@ -28,7 +28,7 @@
"TargetTimes": 1, "TargetTimes": 1,
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"100001": 200000, "100001": 100000,
"100004": 20 "100004": 20
}, },
"Position": [ "Position": [
@ -47,7 +47,7 @@
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"100001": 50000, "100001": 50000,
"100004": 10 "100004": 15
} }
}, },
{ {
@ -76,7 +76,7 @@
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"100001": 100000, "100001": 100000,
"100004": 20 "100004": 30
}, },
"GameType": 1 "GameType": 1
}, },
@ -90,47 +90,11 @@
"TargetTimes": 1, "TargetTimes": 1,
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"100001": 50000, "100001": 100000,
"100004": 20 "100004": 20
}, },
"GameType": 1 "GameType": 1
}, },
{
"Id": 27,
"Order": 7,
"Name": "每日任务",
"Des": "累计充值$4.99",
"ActivityType": 1,
"TaskType": 7,
"TargetTimes": 499,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100004": 30
},
"Position": [
1,
1
]
},
{
"Id": 28,
"Order": 8,
"Name": "每日任务",
"Des": "累计充值$9.99",
"ActivityType": 1,
"TaskType": 7,
"TargetTimes": 999,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100004": 50
},
"Position": [
1,
1
]
},
{ {
"Id": 7, "Id": 7,
"Order": 1, "Order": 1,
@ -152,7 +116,7 @@
"TargetTimes": 300, "TargetTimes": 300,
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"50001": 5 "50001": 2
} }
}, },
{ {
@ -176,7 +140,7 @@
"TargetTimes": 500, "TargetTimes": 500,
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"50001": 10 "50001": 5
} }
}, },
{ {
@ -185,10 +149,10 @@
"Name": "周活跃任务", "Name": "周活跃任务",
"ActivityType": 2, "ActivityType": 2,
"TaskType": 14, "TaskType": 14,
"TargetTimes": 650, "TargetTimes": 600,
"FinishTimes": 1, "FinishTimes": 1,
"Award": { "Award": {
"30008": 1 "100002": 10
} }
}, },
{ {

View File

@ -114,7 +114,7 @@ func init() {
if scene == nil || scene.ExtraData == nil { if scene == nil || scene.ExtraData == nil {
pack.Tag = webapiproto.TagCode_NotFound pack.Tag = webapiproto.TagCode_NotFound
pack.Msg = "房间没找到" pack.Msg = "房间没找到"
return common.ResponseTag_Ok, pack return common.ResponseTag_TransactYield, pack
} }
switch d := scene.ExtraData.(type) { switch d := scene.ExtraData.(type) {
@ -140,7 +140,7 @@ func init() {
} }
pack.List = append(pack.List, item) pack.List = append(pack.List, item)
} }
return common.ResponseTag_Ok, pack
default: default:
pack.Tag = webapiproto.TagCode_FAILED pack.Tag = webapiproto.TagCode_FAILED
pack.Msg = "未实现" pack.Msg = "未实现"

View File

@ -6,10 +6,8 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"net/http" "mongo.games.com/game/common"
"sync/atomic" "mongo.games.com/game/model"
"time"
"mongo.games.com/goserver/core" "mongo.games.com/goserver/core"
"mongo.games.com/goserver/core/admin" "mongo.games.com/goserver/core/admin"
"mongo.games.com/goserver/core/logger" "mongo.games.com/goserver/core/logger"
@ -17,10 +15,9 @@ import (
"mongo.games.com/goserver/core/transact" "mongo.games.com/goserver/core/transact"
"mongo.games.com/goserver/core/utils" "mongo.games.com/goserver/core/utils"
"mongo.games.com/goserver/srvlib" "mongo.games.com/goserver/srvlib"
"net/http"
"mongo.games.com/game/common" "sync/atomic"
"mongo.games.com/game/model" "time"
"mongo.games.com/game/protocol/webapi"
) )
const ( const (
@ -176,10 +173,7 @@ func init() {
}), }),
OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult { OnChildRespWrapper: transact.OnChildRespWrapper(func(tNode *transact.TransNode, hChild transact.TransNodeID, retCode int, ud interface{}) transact.TransExeResult {
logger.Logger.Tracef("GameSrvApi OnChildRespWrapper %v:%v", hChild, ud) logger.Logger.Tracef("GameSrvApi OnChildRespWrapper %v:%v", hChild, ud)
msg, ok := ud.(*webapi.SARoomInfo) tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud)
if ok && msg.GetTag() == webapi.TagCode_SUCCESS {
tNode.TransEnv.SetField(GAMESRVAPI_TRANSACTE_RESPONSE, ud)
}
return transact.TransExeResult(retCode) return transact.TransExeResult(retCode)
}), }),
}) })

Binary file not shown.

Binary file not shown.