优化协议代理代码生成

gs/game/game_manager.go

@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"time"
 
-	appConfig "hk4e/common/config"
+	"hk4e/common/config"
 	"hk4e/common/mq"
 	"hk4e/gate/client_proto"
 	"hk4e/gate/kcp"
@@ -45,14 +45,13 @@ var MESSAGE_QUEUE *mq.MessageQueue
 var SELF *model.Player
 
 type GameManager struct {
-	dao                       *dao.Dao
-	snowflake                 *alg.SnowflakeWorker
-	clientCmdProtoMap         *client_proto.ClientCmdProtoMap
-	clientCmdProtoMapRefValue reflect.Value
-	gsId                      uint32
-	gsAppid                   string
-	mainGsAppid               string
-	ai                        *model.Player // 本服的Ai玩家对象
+	dao               *dao.Dao
+	snowflake         *alg.SnowflakeWorker
+	clientCmdProtoMap *client_proto.ClientCmdProtoMap
+	gsId              uint32
+	gsAppid           string
+	mainGsAppid       string
+	ai                *model.Player // 本服的Ai玩家对象
 }
 
 func NewGameManager(dao *dao.Dao, messageQueue *mq.MessageQueue, gsId uint32, gsAppid string, mainGsAppid string) (r *GameManager) {
@@ -60,9 +59,8 @@ func NewGameManager(dao *dao.Dao, messageQueue *mq.MessageQueue, gsId uint32, gs
 	r.dao = dao
 	MESSAGE_QUEUE = messageQueue
 	r.snowflake = alg.NewSnowflakeWorker(int64(gsId))
-	if appConfig.CONF.Hk4e.ClientProtoProxyEnable {
+	if config.CONF.Hk4e.ClientProtoProxyEnable {
 		r.clientCmdProtoMap = client_proto.NewClientCmdProtoMap()
-		r.clientCmdProtoMapRefValue = reflect.ValueOf(r.clientCmdProtoMap)
 		// 反射调用的方法在启动时测试是否正常防止中途panic
 		r.GetClientProtoObjByName("PingReq")
 	}
@@ -394,7 +392,7 @@ func (g *GameManager) DisconnectPlayer(userId uint32, reason uint32) {
 }
 
 func (g *GameManager) GetClientProtoObjByName(protoObjName string) pb.Message {
-	fn := g.clientCmdProtoMapRefValue.MethodByName("GetClientProtoObjByName")
+	fn := g.clientCmdProtoMap.RefValue.MethodByName("GetClientProtoObjByName")
 	ret := fn.Call([]reflect.Value{reflect.ValueOf(protoObjName)})
 	obj := ret[0].Interface()
 	if obj == nil {

gs/game/player_fight_sync.go

@@ -1,7 +1,7 @@
 package game
 
 import (
-	appConfig "hk4e/common/config"
+	"hk4e/common/config"
 	"hk4e/common/constant"
 	"hk4e/common/utils"
 	"hk4e/gs/model"
@@ -104,7 +104,7 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 		switch entry.ArgumentType {
 		case proto.CombatTypeArgument_COMBAT_EVT_BEING_HIT:
 			hitInfo := new(proto.EvtBeingHitInfo)
-			if appConfig.CONF.Hk4e.ClientProtoProxyEnable {
+			if config.CONF.Hk4e.ClientProtoProxyEnable {
 				clientProtoObj := g.GetClientProtoObjByName("EvtBeingHitInfo")
 				if clientProtoObj == nil {
 					logger.Error("get client proto obj is nil")
@@ -161,7 +161,7 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 			player.CombatInvokeHandler.AddEntry(entry.ForwardType, entry)
 		case proto.CombatTypeArgument_ENTITY_MOVE:
 			entityMoveInfo := new(proto.EntityMoveInfo)
-			if appConfig.CONF.Hk4e.ClientProtoProxyEnable {
+			if config.CONF.Hk4e.ClientProtoProxyEnable {
 				clientProtoObj := g.GetClientProtoObjByName("EntityMoveInfo")
 				if clientProtoObj == nil {
 					logger.Error("get client proto obj is nil")
@@ -227,7 +227,7 @@ func (g *GameManager) CombatInvocationsNotify(player *model.Player, payloadMsg p
 			player.CombatInvokeHandler.AddEntry(entry.ForwardType, entry)
 		case proto.CombatTypeArgument_COMBAT_ANIMATOR_STATE_CHANGED:
 			evtAnimatorStateChangedInfo := new(proto.EvtAnimatorStateChangedInfo)
-			if appConfig.CONF.Hk4e.ClientProtoProxyEnable {
+			if config.CONF.Hk4e.ClientProtoProxyEnable {
 				clientProtoObj := g.GetClientProtoObjByName("EvtAnimatorStateChangedInfo")
 				if clientProtoObj == nil {
 					logger.Error("get client proto obj is nil")
@@ -386,7 +386,7 @@ func (g *GameManager) ClientAbilityChangeNotify(player *model.Player, payloadMsg
 		switch abilityInvokeEntry.ArgumentType {
 		case proto.AbilityInvokeArgument_ABILITY_META_ADD_NEW_ABILITY:
 			abilityMetaAddAbility := new(proto.AbilityMetaAddAbility)
-			if appConfig.CONF.Hk4e.ClientProtoProxyEnable {
+			if config.CONF.Hk4e.ClientProtoProxyEnable {
 				clientProtoObj := g.GetClientProtoObjByName("AbilityMetaAddAbility")
 				if clientProtoObj == nil {
 					logger.Error("get client proto obj is nil")
@@ -413,7 +413,7 @@ func (g *GameManager) ClientAbilityChangeNotify(player *model.Player, payloadMsg
 			worldAvatar.abilityList = append(worldAvatar.abilityList, abilityMetaAddAbility.Ability)
 		case proto.AbilityInvokeArgument_ABILITY_META_MODIFIER_CHANGE:
 			abilityMetaModifierChange := new(proto.AbilityMetaModifierChange)
-			if appConfig.CONF.Hk4e.ClientProtoProxyEnable {
+			if config.CONF.Hk4e.ClientProtoProxyEnable {
 				clientProtoObj := g.GetClientProtoObjByName("AbilityMetaModifierChange")
 				if clientProtoObj == nil {
 					logger.Error("get client proto obj is nil")

gs/game/player_stamina.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"time"
 
-	appConfig "hk4e/common/config"
+	"hk4e/common/config"
 	"hk4e/common/constant"
 	"hk4e/common/utils"
 	"hk4e/gdconf"
@@ -23,7 +23,7 @@ func (g *GameManager) HandleAbilityStamina(player *model.Player, entry *proto.Ab
 	case proto.AbilityInvokeArgument_ABILITY_MIXIN_COST_STAMINA:
 		// 大剑重击 或 持续技能 耐力消耗
 		costStamina := new(proto.AbilityMixinCostStamina)
-		if appConfig.CONF.Hk4e.ClientProtoProxyEnable {
+		if config.CONF.Hk4e.ClientProtoProxyEnable {
 			clientProtoObj := g.GetClientProtoObjByName("AbilityMixinCostStamina")
 			if clientProtoObj == nil {
 				logger.Error("get client proto obj is nil")