Merge branch 'develop' into sdk

src/server/MergeConst/ErrorCode.go

@@ -98,6 +98,6 @@ const G_Champion_People_Cnt = 50
 const (
 	ORDER_STATUS_IDLE   = 0 // 订单未完成
 	ORDER_STATUS_PAY    = 1 // 订单已支付
-	ORDER_STATUS_CANCLE = 2 // 订单取消
+	ORDER_STATUS_CANCEL = 2 // 订单取消
 	ORDER_STATUS_SHIP   = 3 // 订单已发货
 )

src/server/conf/playroom/playroomCfg.go

@@ -125,3 +125,11 @@ func GetDecorateList() []int {
 	}
 	return r
 }
+
+func GetBuyItem(Id int) ([]*item.Item, []*item.Item) {
+	data, err := gamedata.GetDataByIntKey(CFG_PLAYROOM_MOOD, Id)
+	if err != nil {
+		return nil, nil
+	}
+	return gamedata.GetItemList(data, "Cost2"), gamedata.GetItemList(data, "Buy")
+}

src/server/game/GameLogic.go

@@ -613,7 +613,7 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("ReqRemoveAd", ReqRemoveAdFunc)
 	RegisterMsgProcessFunc("ReqPlayerBriefProfileData", ReqPlayerBriefProfileDataFunc)
 	RegisterMsgProcessFunc("ReqOfflineReconnect", ReqOfflineReconnectFunc)
-
+	RegisterMsgProcessFunc("ReqPlayerAsset", ReqPlayerAsset)
 	// 玩家
 	RegisterMsgProcessFunc("ReqUserInfo", ReqUserInfo)
 	RegisterMsgProcessFunc("ReqSetName", ReqSetName)                         // 设置名字
@@ -778,6 +778,7 @@ func (ad *GameLogic) RegisterNetWorkFunc() {
 	RegisterMsgProcessFunc("ReqFriendTreasureStart", ReqFriendTreasureStart) // 开始游戏
 	RegisterMsgProcessFunc("ReqFriendTreasureFilp", ReqFriendTreasureFilp)   // 翻牌
 	RegisterMsgProcessFunc("ReqFriendTreasureEnd", ReqFriendTreasureEnd)     // 结束游戏
+	RegisterMsgProcessFunc("ReqPlayroomBuyItem", ReqPlayroomBuyItem)         // 购买playroom物品
 
 	RegisterMsgProcessFunc("ReqKafkaLog", ReqKafkaLog)           // 客户端日志
 	RegisterMsgProcessFunc("ReqCreateOrderSn", ReqCreateOrderSn) // 创建订单号

src/server/game/PlayerFunc.go

@@ -403,7 +403,6 @@ func CreateOrderSn(p *Player, ChargeId int, Platform, Channel string) (string, e
 }
 
 func GoogleVerify(p *Player, OrderSn, ProduceId, Token string) (*db.SqlChargeOrderStruct, error) {
-
 	Order, err := db.GetPlayerChargeData(OrderSn)
 	if err != nil {
 		return nil, err
@@ -450,6 +449,22 @@ func GoogleVerify(p *Player, OrderSn, ProduceId, Token string) (*db.SqlChargeOrd
 	return Order, nil
 }
 
+func CancelOrder(p *Player, OrderSn string) error {
+	Order, err := db.GetPlayerChargeData(OrderSn)
+	if err != nil {
+		return err
+	}
+	if Order.PayStatus != MergeConst.ORDER_STATUS_PAY {
+		return fmt.Errorf("订单未支付")
+	}
+	Order.PayStatus = MergeConst.ORDER_STATUS_CANCEL
+	err = db.UpdatePlayerChargeData(Order)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func BackUserInfo(p *Player) {
 	BaseMod := p.PlayMod.getBaseMod()
 	FaceMod := p.PlayMod.getFaceMod()

src/server/game/RegisterNetworkFunc.go

@@ -31,6 +31,12 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
+func ReqPlayerAsset(args []interface{}) error {
+	_, player, _ := ParseArgs(args)
+	player.PushClientRes(player.PlayerBaseMod.BackAsset())
+	return nil
+}
+
 // 请求玩家基础信息
 func ReqPlayerBaseInfofunction(args []interface{}) error {
 	// 消息的发送者
@@ -2186,6 +2192,14 @@ func ReqShippingOrder(args []interface{}) error {
 	req := &msg.ReqShippingOrder{}
 	proto.Unmarshal(buf, req)
 	OrderSn := req.OrderSn
+	Status := int(req.Status)
+	if Status != MergeConst.ORDER_STATUS_CANCEL { // 取消支付
+		CancelOrder(player, OrderSn)
+		player.PushClientRes(&msg.ResShippingOrder{
+			Code: msg.RES_CODE_SUCCESS,
+		})
+		return nil
+	}
 	OrderData, err := GoogleVerify(player, OrderSn, req.ProduceId, req.Token)
 	if err != nil {
 		return err
@@ -3169,6 +3183,44 @@ func ReqPlayroomFlipReward(args []interface{}) error {
 	return nil
 }
 
+func ReqPlayroomBuyItem(args []interface{}) error {
+	_, player, buf := ParseArgs(args)
+	req := &msg.ReqPlayroomBuyItem{}
+	proto.Unmarshal(buf, req)
+	PlayroomMod := player.PlayMod.getPlayroomMod()
+	AddItems, CostItem := PlayroomMod.BuyItem(int(req.Id))
+	if CostItem == nil {
+		err := fmt.Errorf("can not buy item")
+		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
+			Code: msg.RES_CODE_FAIL,
+			Msg:  err.Error(),
+		})
+		return err
+	}
+	err := player.HandleLoseItem(CostItem, msg.ITEM_POP_LABEL_PlayroomBuyItem.String())
+	if err != nil {
+		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
+			Code: msg.RES_CODE_FAIL,
+			Msg:  err.Error(),
+		})
+		return err
+	}
+	err = player.HandleItem(AddItems, msg.ITEM_POP_LABEL_PlayroomBuyItem.String())
+	if err != nil {
+		player.SendErrClienRes(&msg.ResPlayroomBuyItem{
+			Code: msg.RES_CODE_FAIL,
+			Msg:  err.Error(),
+		})
+		return err
+	}
+	player.PlayMod.save()
+	// PlayroomBackData(player)
+	player.PushClientRes(&msg.ResPlayroomBuyItem{
+		Code: msg.RES_CODE_SUCCESS,
+	})
+	return nil
+}
+
 func ReqOfflineReconnectFunc(args []interface{}) error {
 	a := args[0].(gate.Agent)
 

src/server/game/mod/order/Order.go

@@ -424,7 +424,7 @@ func (o *OrderMod) CreateExtraOrder(AddChess, AddNewEmit, ChessList []int, Energ
 	//额外订单补充1；CDEG发射器首次合成时，生成其对应2及棋子订单，完成后生成3及，再完成生成4及的；
 	if b1 {
 		ChessColor := mergeDataCfg.GetEmitProduceChessType(OrderEmit)
-		ChessId := mergeDataCfg.GetChessIdByLvAndColor(EnergyMul, ChessColor[0])
+		ChessId := mergeDataCfg.GetChessIdByLvAndColor(EnergyMul+1, ChessColor[0])
 		if ChessId != 0 {
 			o.PreheatStep[ChessColor[0]] = 1
 			o.addOrder([]int{ChessId}, diff_low, Preheat_type)

src/server/game/mod/playroom/playroom.go

@@ -455,3 +455,7 @@ func (p *PlayroomMod) GetFlipReward() ([]*item.Item, error) {
 	}
 	return Items, fmt.Errorf("GetFlipReward check is not 3")
 }
+
+func (p *PlayroomMod) BuyItem(Id int) ([]*item.Item, []*item.Item) {
+	return playroomCfg.GetBuyItem(Id)
+}