add: 日志输出

RO_Server_Trunk-branch_0.1.39/rocommon/rpc/msg.go

@@ -24,7 +24,7 @@ const (
 
 //var SC_HAND_SHAKE_NTFMsgId = MessageInfoByName("SCHandShakeNtf").ID
 
-///////////////////////
+// /////////////////////
 func ReadMessage(reader io.Reader, maxMsgLen int, aesKey *[]byte) (msg interface{}, msgSeqId uint32, err error) {
 	var msgId, flagId uint16 = 0, 0
 	var msgData []byte
@@ -114,7 +114,7 @@ func ReadMessage(reader io.Reader, maxMsgLen int, aesKey *[]byte) (msg interface
 	return
 }
 
-//消息反序列化
+// 消息反序列化
 func DecodeMessage(id int, data []byte) (interface{}, *rocommon.MessageInfo, error) {
 	msgInfo := rocommon.MessageInfoByID(id)
 	if msgInfo == nil {
@@ -151,6 +151,11 @@ func SendMessage(writer io.Writer, msg interface{}, aesKey *[]byte, maxMsgLen in
 		msgId = uint16(msgInfo.ID)
 	}
 
+	if msgId != 1001 && msgId != 15 && msgId != 3 {
+		util.InfoF("SendMessage msgId=%v", msgId)
+		//log.Printf("SendMessage msgData=%v", string(msgData))
+	}
+
 	//todo
 	// 注意上层发包不要超过最大值
 	msgLen := len(msgData)
@@ -208,7 +213,7 @@ func SendMessage(writer io.Writer, msg interface{}, aesKey *[]byte, maxMsgLen in
 	return err
 }
 
-//消息序列化
+// 消息序列化
 func EncodeMessage(msg interface{}) (data []byte, info *rocommon.MessageInfo, err error) {
 	info = rocommon.MessageInfoByMsg(msg)
 	if info == nil {
@@ -222,7 +227,7 @@ func EncodeMessage(msg interface{}) (data []byte, info *rocommon.MessageInfo, er
 	return
 }
 
-//获取原始包数据(二进制)，不做解析处理
+// 获取原始包数据(二进制)，不做解析处理
 func RecvPackageData(reader io.Reader, maxMsgLen int) (msgId uint16, msgSeqId uint32, msgFlagId uint16, msgData []byte, err error) {
 	bufMsgLen := make([]byte, lenMaxLen)
 	_, err = io.ReadFull(reader, bufMsgLen)

RO_Server_Trunk-branch_0.1.39/roserver/auth/model/auth_proc.go

@@ -13,7 +13,7 @@ const (
 	PlatformOpenIdConnectInfoPrefix = "pp_conn_" //openid对应的连接信息
 )
 
-//透传给client
+// 透传给client
 func LoginRet(ev rocommon.ProcEvent, ret int32) {
 	loginAck := &serverproto.SCLoginAck{
 		Error: ret,
@@ -21,7 +21,7 @@ func LoginRet(ev rocommon.ProcEvent, ret int32) {
 	model.ServiceReplay(ev, loginAck)
 }
 
-//sdk返回以后的透传client操作
+// sdk返回以后的透传client操作
 func LoginRetSDK(session rocommon.Session, clientId uint64, ret int32) {
 	loginAck := &serverproto.SCLoginAck{
 		Error: ret,

RO_Server_Trunk-branch_0.1.39/roserver/baseserver/hook_event.go

@@ -99,6 +99,7 @@ func (this *BackendTCPEventHook) InEvent(in rocommon.ProcEvent) rocommon.ProcEve
 	switch inMsg := in.Msg().(type) {
 	case *serverproto.GateTransmitAck:
 		userMsg, _, err := rpc.DecodeMessage(int(inMsg.MsgId), inMsg.MsgData)
+		util.InfoF("BackendTCPEventHook InEvent clientID=%v msgID=%v msg=%v", inMsg.ClientId, inMsg.MsgId, inMsg.MsgData)
 		if err != nil {
 			util.WarnF("[BackendTCPEventHook::InEvent] msg decode err:%v msgId:%v", err.Error(), inMsg.MsgId)
 			return nil

RO_Server_Trunk-branch_0.1.39/roserver/config/csv/ActivitiesBtFirstChargeCfg.csv

@@ -1,5 +1,5 @@
 唯一id,名称,解锁条件,充值金额,奖励1,价值,奖励2,价值,奖励3,价值
 Id,Name,OpenCondition,RechargeAmount,Reward1,Value1,Reward2,Value2,Reward3,Value3
 int,string,list,list,list,int,list,int,list,int
-1,首充大礼包,11:10013,1;98;328,13152:1;404:30;405:30;406:30,100000,110:5;11:20000;1:50000,70000,513:1;5:50000;1:200000,270000
+1,首充大礼包,11:10013,99;1499;4999,13152:1;404:30;405:30;406:30,100000,110:5;11:20000;1:50000,70000,513:1;5:50000;1:200000,270000
 2,百元大礼包,,38,5010:1;12140:1;1:50000,1000000,839:1;140:5;1:100000,1000000,13149:1;404:30;405:30;406:30,888888

RO_Server_Trunk-branch_0.1.39/roserver/config/csv/PurseShopCfg.csv

@@ -1,12 +1,12 @@
 礼包Id,礼包名字,类型,价格,购买后获得道具,首次购买奖励,购买额外获得,限购类型次数,排序Id,累计充值金额
 Id,Name,Type,RMB,Reward,FirstBuyReward,ExtraBuyReward,RestrictedType,SortId,RmbTotalPay
 int,string,int,float,list,list,list,int,int,int
-1,6000金币,5,0.99,2:6000,2:6000,2:600,50,1,
-2,1.2万金币,5,1.99,2:12000,2:12000,2:1200,50,3,
-3,1.8万金币,5,2.99,2:18000,2:18000,2:1800,50,4,
-4,3万金币,5,4.99,2:30000,2:30000,2:3000,50,5,
-5,6.8万金币,5,9.99,2:68000,2:68000,2:6800,50,6,
-6,9.8万金币,5,14.99,2:98000,2:98000,2:9800,50,7,
-7,12.8万金币,5,19.99,2:128000,2:128000,2:12800,50,8,
-8,32.8万金币,5,49.99,2:328000,2:328000,2:32800,50,9,
-9,64.8万金币,5,99.99,2:648000,2:648000,2:64800,50,10,
+1,1000金幣,5,1,2:1000,2:1000,2:100,50,1,
+2,3萬金幣,5,30,2:30000,2:30000,2:3000,50,3,
+3,9.8萬金幣,5,98,2:98000,2:98000,2:9800,50,4,
+4,12.8萬金幣,5,128,2:128000,2:128000,2:12800,50,5,
+5,32.8萬金幣,5,328,2:328000,2:328000,2:32800,50,6,
+6,64.8萬金幣,5,648,2:648000,2:648000,2:64800,50,7,
+7,100萬金幣,5,1000,2:1000000,2:1000000,2:100000,50,8,
+8,200萬金幣,5,2000,2:2000000,2:2000000,2:200000,50,9,
+9,500萬金幣,5,5000,2:5000000,2:5000000,2:500000,50,10,

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role.go

@@ -1231,6 +1231,8 @@ func (this *Role) FuncDisable() bool {
 
 // 推送客户端启动时需要的信息，例如基本信息，背包信息等
 func (this *Role) StartupProto() {
+	// todo 测试使用
+	time.Sleep(200 * time.Millisecond)
 	nowTime := util.GetTimeMilliseconds()
 	startUpTime := service.GetServiceStartupTime()
 	ntfMsg := &serverproto.SCStartupInfoNtf{

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_bt.go

@@ -536,7 +536,7 @@ func (this *RoleBT) UnlockBTSystem() {
 	}
 }
 
-//超值首充 & 百元大礼包
+// 超值首充 & 百元大礼包
 func (this *RoleBT) FirstRechargeReward(rewardIdx int32) serverproto.ErrorCode {
 	//todo...
 	//if this.baseData.FirstRechargeTime <= 0 || rewardIdx <= 0 || rewardIdx > 3 || model.ConvertBTFirstRecharge == nil {
@@ -549,8 +549,8 @@ func (this *RoleBT) FirstRechargeReward(rewardIdx int32) serverproto.ErrorCode {
 	if this.baseData.FirstRechargeRewardState&(1<<uint32(rewardIdx)) > 0 {
 		return serverproto.ErrorCode_ERROR_BT_FIRSTRECHARGE_REWARDED
 	}
-	//判断累计充值是否达到(花钱购买累计充值+免费充值额度使用)
-	totalRecharge := uint64(this.role.GetTotalRecharge()) + this.role.GetBTJiaTotalRecharge()
+	//判断累计充值是否达到(花钱购买累计充值+免费充值额度使用) 配置是*100的，校验也*100
+	totalRecharge := (uint64(this.role.GetTotalRecharge()) + this.role.GetBTJiaTotalRecharge()) * 100
 
 	rewardCfgData := model.ConvertBTFirstRecharge.RewardList[rewardIdx-1]
 	if totalRecharge < uint64(rewardCfgData.RewardCondition) {

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_send.go

@@ -41,7 +41,7 @@ func (this *Role) ReplayGate(msg interface{}, transmit bool) int {
 		}
 	}
 
-	util.InfoF("[game model role_send] replygate msg:%+v", msg)
+	util.InfoF("[game model role_send] replygate clientID:%v msgid:%v msg:%+v", this.cliID.SessID, info.ID, msg)
 
 	var ackSeqId uint32 = 0
 	var confirmId = uint32(info.ConfirmMsgId)

RO_Server_Trunk-branch_0.1.39/roserver/gate/model/proc_rpc.go

@@ -17,13 +17,13 @@ import (
 	"github.com/gorilla/websocket"
 )
 
-//消息解析操作
-//MessageProcessor def.go
-//TCPMessageProcessor procrpc.go 基础实现方法
+// 消息解析操作
+// MessageProcessor def.go
+// TCPMessageProcessor procrpc.go 基础实现方法
 type DirectTCPMessageProcessor struct {
 }
 
-//recv直接原始数据传递到后端 / 返回消息给client
+// recv直接原始数据传递到后端 / 返回消息给client
 func (this *DirectTCPMessageProcessor) OnRecvMsg(s rocommon.Session) (msg interface{}, seqId uint32, err error) {
 	reader, ok := s.Raw().(io.Reader)
 	if !ok || reader == nil {
@@ -45,18 +45,23 @@ func (this *DirectTCPMessageProcessor) OnRecvMsg(s rocommon.Session) (msg interf
 		var flagId uint16 //加密方式
 		//获取原始格式数据包(pb序列化的二进制数据)
 		msgId, seqId, flagId, msgData, err = rpc.RecvPackageData(reader, opt.MaxMsgLen())
-		util.InfoF("OnRecvMsg-RecvPackageData msgId=%v msgData=%v", msgId, msgData)
 
 		//尝试直接发送到其他后端服务器或者解析
 		if err == nil {
 			msg, err = FrontendPackageProc(int(msgId), seqId, flagId, msgData, s)
-			util.ErrorF("OnRecvMsg-FrontendPackageProc msg=%v error=%v", msg, err)
+			util.DebugF("OnRecvMsg-FrontendPackageProc msg=%v error=%v", msg, err)
+
+			if msgId != 1000 {
+				util.InfoF("OnRecvMsg-RecvPackageData msgId=%v", msgId)
+				//log.Printf("OnRecvMsg-RecvPackageData  msgData=%v", string(msgData))
+			}
+
 		}
 	})
 	return
 }
 
-//send 直接发往客户端的消息
+// send 直接发往客户端的消息
 func (this *DirectTCPMessageProcessor) OnSendMsg(s rocommon.Session, msg interface{}) (err error) {
 	writer, ok := s.Raw().(io.Writer)
 	if !ok || writer == nil {
@@ -71,6 +76,7 @@ func (this *DirectTCPMessageProcessor) OnSendMsg(s rocommon.Session, msg interfa
 	} else {
 		opt = s.GetSessionOpt().(socket.SocketOption)
 	}
+
 	opt.SocketWriteTimeout(writer.(net.Conn), func() {
 		err = rpc.SendMessage(writer, msg, s.GetAES(), opt.MaxMsgLen(), "")
 	})
@@ -87,7 +93,7 @@ var (
 	CSPlayerGMReqMsgId = rocommon.MessageInfoByName("CSGMCommandReq").ID
 )
 
-//尝试直接发送到其他后端服务器或者解析后直接回复client
+// 尝试直接发送到其他后端服务器或者解析后直接回复client
 func FrontendPackageProc(msgId int, seqId uint32, flagId uint16, msgData []byte, s rocommon.Session) (msg interface{}, err error) {
 	switch flagId {
 	case 1: //rsa加密的数据