Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

.gitlab-ci.yml

@@ -1,6 +1,7 @@
 stages:
   - build
   - deploy
+  - push
 
 variables:
   ProjectPath: "mongo.games.com/game"
@@ -8,11 +9,12 @@ variables:
 
 default:
   tags:
-    - game-develop
+    - gitlab
 
 build-job:
   stage: build
   script:
+    - git checkout $CI_COMMIT_REF_NAME
     # 拷贝到GOPATH
     - echo '拷贝到GOPATH'
     - cp -rfp ./* $GOPATH/src/$ProjectPath
@@ -33,6 +35,12 @@ build-job:
 deploy-job:
   stage: deploy
   script:
+    # 拉取
+    - echo "拉取deploy"
+    - cd $GOPATH/src/$DeployPath
+    - git checkout $CI_COMMIT_REF_NAME
+    - git pull
+
     # 拷贝data目录
     - echo '拷贝data目录'
     - cd $GOPATH/src/$ProjectPath
@@ -58,10 +66,14 @@ deploy-job:
           rm -rf $line/$line
       done < shell/programs.txt
 
+push_job:
+  stage: push
+  script:
     # 提交代码
     - echo '提交代码'
     - cd $GOPATH/src/$DeployPath
+    - git config user.email "ci@example.com"        # 设置提交者的 email
+    - git config user.name "GitLab CI"              # 设置提交者的名称
     - git add .
-    - git commit -m "auto commit pipelineId: $CI_PIPELINE_ID"
+    - git commit -m "auto commit pipelineId $CI_PIPELINE_ID"
-    - git push origin develop
+    - git push origin $CI_COMMIT_REF_NAME
-

machine/action/action_server.go

@@ -173,6 +173,9 @@ func SMDollMachineGrabHandler(session *netlib.Session, packetId int, data interf
 
 // 监听抓取结果返回
 func DollMachineGrabResult(conn *machinedoll.Conn, snid, id int32) {
+	if conn == nil {
+		return
+	}
 	num := int64(1)
 	for {
 		// 读取数据
@@ -183,6 +186,7 @@ func DollMachineGrabResult(conn *machinedoll.Conn, snid, id int32) {
 			logger.Logger.Error("Failed to read response from client:", err)
 			err := conn.Conn.Close()
 			if err != nil {
+				logger.Logger.Error("conn.Conn.Close():", err)
 				return
 			}
 			return

worldsrv/action_chat.go

@@ -327,11 +327,11 @@ func CSShieldMsgHandler(s *netlib.Session, packetid int, data interface{}, sid i
 
 func init() {
 	//聊天消息
-	common.Register(int(chat.ChatPacketID_PACKET_SCChatMsg), &chat.CSChatMsg{}, CSChatMsgHandler)
+	common.Register(int(chat.ChatPacketID_PACKET_CSChatMsg), &chat.CSChatMsg{}, CSChatMsgHandler)
 	//聊天记录
 	common.Register(int(chat.ChatPacketID_PACKET_CSGetChatLog), &chat.CSGetChatLog{}, CSGetChatLogHandler)
 	//读消息
 	common.Register(int(chat.ChatPacketID_PACKET_CSReadChatMsg), &chat.CSReadChatMsg{}, CSReadChatMsgHandler)
 	//屏蔽玩家
-	common.Register(int(chat.ChatPacketID_PACKET_SCShieldMsg), &chat.SCShieldMsg{}, CSShieldMsgHandler)
+	common.Register(int(chat.ChatPacketID_PACKET_CSShieldMsg), &chat.SCShieldMsg{}, CSShieldMsgHandler)
 }

worldsrv/player.go

@@ -1122,17 +1122,19 @@ func (this *Player) GetMessageAttach(id string) {
 								}
 
 								if tp != -1 {
-									giveType := gainWay
+									giveType := int32(-1)
 									switch gainWay {
 									case common.GainWayItemPermitRank:
 										giveType = model.SystemFreeGive_GiveType_TaskPermitRank
 									case common.GainWayClientUpgrade:
 										giveType = model.SystemFreeGive_ClientUpgrade
 									}
+									if giveType != -1 && msg.Oper == 0 && !this.IsRob {
 										mq.Write(model.GenerateSystemFreeGive(this.SnId, this.Name, this.Platform, this.Channel,
 											giveType, tp, msg.Params[i+1]))
 									}
 								}
+							}
 							BagMgrSingleton.AddItems(&model.AddItemParam{
 								Platform: this.Platform,
 								SnId:     this.SnId,