guess

plugin/dapp/guess/executor/exec.go

@@ -14,12 +14,17 @@ func (c *Guess) Exec_Start(payload *pkt.GuessGameStart, tx *types.Transaction, i
 	return action.GameStart(payload)
 }
 
-func (c *Guess) Exec_Continue(payload *pkt.PBGameContinue, tx *types.Transaction, index int) (*types.Receipt, error) {
+func (c *Guess) Exec_Bet(payload *pkt.GuessGameBet, tx *types.Transaction, index int) (*types.Receipt, error) {
 	action := NewAction(c, tx, index)
-	return action.GameContinue(payload)
+	return action.GameBet(payload)
 }
 
-func (c *Guess) Exec_Quit(payload *pkt.PBGameQuit, tx *types.Transaction, index int) (*types.Receipt, error) {
+func (c *Guess) Exec_Publish(payload *pkt.GuessGamePublish, tx *types.Transaction, index int) (*types.Receipt, error) {
 	action := NewAction(c, tx, index)
-	return action.GameQuit(payload)
+	return action.GamePublish(payload)
+}
+
+func (c *Guess) Exec_Abort(payload *pkt.GuessGameAbort, tx *types.Transaction, index int) (*types.Receipt, error) {
+	action := NewAction(c, tx, index)
+	return action.GameAbort(payload)
 }
\ No newline at end of file

plugin/dapp/guess/plugin.go

@@ -14,7 +14,7 @@ import (
 
 func init() {
 	pluginmgr.Register(&pluginmgr.PluginBase{
-		Name:     types.PokerBullX,
+		Name:     types.GuessX,
 		ExecName: executor.GetName(),
 		Exec:     executor.Init,
 		Cmd:      commands.GuessCmd,

plugin/dapp/guess/proto/guess.proto

@@ -14,7 +14,7 @@ message GuessGame {
     string category      = 6;  //分类
     string options       = 7;  //选项
     string maxTime       = 8;  //截止下注时间
-    uint32 maxHeight     = 9;  //截止下注的块高
+    int64 maxHeight     = 9;  //截止下注的块高
     string symbol        = 10;  //bty或者具体token
     string exec          = 11; //coins或者token
     uint32 oneBet        = 12; //一注等于多少bty或者token
@@ -23,17 +23,18 @@ message GuessGame {
     uint32 fee           = 15; //收取费用，不带则表示不收费
     string feeAddr       = 16; //收费地址
     string expire        = 17; //游戏过期时间
-    uint32 expireHeight  = 18; //游戏过期区块高度
+    int64 expireHeight  = 18; //游戏过期区块高度
     string adminAddr     = 19; //游戏创建者地址,只有该地址可以开奖
     uint32 betsNumber    = 20; //已下注数,如果数量达到maxBetsNumber，则不允许再下注
     repeated GuessPlayer plays = 21; //参与游戏下注的玩家投注信息
     string result = 22;
     repeated GuessBet bets = 23;
+    int64 index          = 24;
 }
 
 message GuessPlayer {
     string addr = 1;
-    repeated GuessBet bets = 2;
+    GuessBet bet = 2;
 }
 
 message GuessBet {
@@ -145,7 +146,7 @@ message GuessGameStart{
     string options   = 2;
     string category  = 3;
     string maxTime   = 4;
-    uint32 maxHeight = 5;
+    int64 maxHeight = 5;
     string symbol    = 6;
     string exec      = 7;
     uint32 oneBet    = 8;
@@ -154,7 +155,7 @@ message GuessGameStart{
     uint64 fee       = 11;
     string feeAddr   = 12;
     string expire    = 13;
-    uint32 expireHeight = 14;
+    int64 expireHeight = 14;
 }
 
 //参与游戏下注

plugin/dapp/guess/rpc/rpc.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/33cn/chain33/types"
 	pb "github.com/33cn/plugin/plugin/dapp/guess/types"
-	"github.com/33cn/plugin/plugin/dapp/pokerbull/executor"
+	"github.com/33cn/plugin/plugin/dapp/guess/executor"
 )
 
 func (c *channelClient) GuessStart(ctx context.Context, head *pb.GuessGameStart) (*types.UnsignTx, error) {

plugin/dapp/guess/types/const.go

@@ -13,8 +13,10 @@ const (
 
 	GuessGameActionStart = iota + 1
 	GuessGameActionBet
+	GuessGameActionStopBet
 	GuessGameActionAbort
 	GuessGameActionPublish
+	GuessGameActionTimeOut
 )
 
 const (
@@ -31,8 +33,10 @@ const (
 
 	TyLogGuessGameStart = 901
 	TyLogGuessGameBet   = 902
-	TyLogGuessGameAbort  = 903
-	TyLogGuessGamePublish = 904
+	TyLogGuessGameStopBet = 903
+	TyLogGuessGameAbort  = 904
+	TyLogGuessGamePublish = 905
+	TyLogGuessGameTimeout = 906
 )
 
 //包的名字可以通过配置文件来配置

plugin/dapp/guess/types/types.go

@@ -18,40 +18,6 @@ func init() {
 }
 
 // exec
-type PokerBullType struct {
-	types.ExecTypeBase
-}
-
-func NewType() *PokerBullType {
-	c := &PokerBullType{}
-	c.SetChild(c)
-	return c
-}
-
-func (t *PokerBullType) GetPayload() types.Message {
-	return &PBGameAction{}
-}
-
-func (t *PokerBullType) GetTypeMap() map[string]int32 {
-	return map[string]int32{
-		"Start":    PBGameActionStart,
-		"Continue": PBGameActionContinue,
-		"Quit":     PBGameActionQuit,
-		"Query":    PBGameActionQuery,
-	}
-}
-
-func (t *PokerBullType) GetLogMap() map[int64]*types.LogInfo {
-	return map[int64]*types.LogInfo{
-		TyLogPBGameStart:    {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameStart"},
-		TyLogPBGameContinue: {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameContinue"},
-		TyLogPBGameQuit:     {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameQuit"},
-		TyLogPBGameQuery:    {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameQuery"},
-	}
-}
-
-
-// exec
 type GuessType struct {
 	types.ExecTypeBase
 }
@@ -68,20 +34,23 @@ func (t *GuessType) GetPayload() types.Message {
 
 func (t *GuessType) GetTypeMap() map[string]int32 {
 	return map[string]int32{
-		"Start":    PBGameActionStart,
-		"Continue": PBGameActionContinue,
-		"Quit":     PBGameActionQuit,
-		"Query":    PBGameActionQuery,
+		"Start": GuessGameActionStart,
+		"Bet": GuessGameActionBet,
+		"Abort": GuessGameActionAbort,
+		"Publish": GuessGameActionPublish,
 	}
 }
 
-func (t *PokerBullType) GetLogMap() map[int64]*types.LogInfo {
+func (t *GuessType) GetLogMap() map[int64]*types.LogInfo {
 	return map[int64]*types.LogInfo{
-		TyLogPBGameStart:    {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameStart"},
-		TyLogPBGameContinue: {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameContinue"},
-		TyLogPBGameQuit:     {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameQuit"},
-		TyLogPBGameQuery:    {reflect.TypeOf(ReceiptPBGame{}), "TyLogPBGameQuery"},
+		TyLogGuessGameStart:    {reflect.TypeOf(ReceiptGuessGame{}), "TyLogGuessGameStart"},
+		TyLogGuessGameBet: {reflect.TypeOf(ReceiptGuessGame{}), "TyLogGuessGameBet"},
+		TyLogGuessGameStopBet:     {reflect.TypeOf(ReceiptGuessGame{}), "TyLogGuessGameStopBet"},
+		TyLogGuessGameAbort:    {reflect.TypeOf(ReceiptGuessGame{}), "TyLogGuessGameAbort"},
+		TyLogGuessGamePublish:    {reflect.TypeOf(ReceiptGuessGame{}), "TyLogGuessGamePublish"},
+		TyLogGuessGameTimeout:    {reflect.TypeOf(ReceiptGuessGame{}), "TyLogGuessGameTimeout"},
 	}
 }
 
 
+