Merge branch 'develop' into audit

src/server/conf/server.json

@@ -35,5 +35,5 @@
 	"KafkaHost":"kafka-server",
 	"KafkaPort":"9092",
 	"Version":"1.0.0",
-	"IdVerify":true
+	"IdVerify":false
 }

src/server/game/Player.go

@@ -152,11 +152,10 @@ func (p *Player) ProcessTrigger() {
 	DailyTaskMod := p.PlayMod.getDailyTaskMod()
 	MailMod := p.PlayMod.getMailMod()
 	PlayroomMod := p.PlayMod.getPlayroomMod()
-	GuideMod := p.PlayMod.getGuideMod()
 	IsPlayroomBack := false
 	IsMailBack := false
 	for _, tr := range p.Trigger {
-		if DailyTaskMod.Trigger(tr, GuideMod.CheckFinishFirstTask()) {
+		if DailyTaskMod.Trigger(tr) {
 			IsDailyBack = true
 		}
 		if p.MailTrigger(tr) {

src/server/game/RegisterNetworkFunc.go

@@ -105,7 +105,6 @@ func ReqUnBindFacebook(player *Player, buf []byte) error {
 }
 
 func ReqOnlyBindFacebook(player *Player, buf []byte) error {
-
 	player.PlayerBaseMod.ReqOnlyBindFacebook(player, buf)
 	return nil
 }
@@ -119,7 +118,9 @@ func RegSetEneryFunc(player *Player, buf []byte) error {
 	req := &msg.ReqSetEnergyMul{}
 	proto.Unmarshal(buf, req)
 	MaxEnergyMul := player.GetPlayerBaseMod().GetMaxEnergyMul(player)
-	if int(req.EnergyMul) > MaxEnergyMul {
+	BaseMod := player.PlayMod.getBaseMod()
+	EnergyMul := BaseMod.GetEnergyMul()
+	if int(req.EnergyMul) > EnergyMul && int(req.EnergyMul) > MaxEnergyMul {
 		player.SendErrClienRes(&msg.ResSetEnergyMul{
 			ResultCode: msg.RES_CODE_FAIL,
 			Msg:        "能量倍数超过最大值",
@@ -127,7 +128,7 @@ func RegSetEneryFunc(player *Player, buf []byte) error {
 		return errors.New("能量倍数超过最大值")
 	}
 	player.TeLog("mutil_merge_change", map[string]interface{}{
-		"change_from": math.Pow(2, float64(MaxEnergyMul)),
+		"change_from": math.Pow(2, float64(BaseMod.GetEnergyMul())),
 		"change_to":   math.Pow(2, float64(req.EnergyMul)),
 		"is_auto":     false,
 	})

src/server/game/mod/chess/Chess.go

@@ -262,7 +262,7 @@ func (cb *ChessBorad) GetEmitList() []int {
 		if EmitID == "" {
 			continue
 		}
-		if cb.Retire[EmitID] == EMIT_RETIRE_END {
+		if cb.Retire[EmitID] == EMIT_RETIRE_START {
 			continue
 		}
 		EmitType := mergeDataCfg.GetEmitType(k)

src/server/game/mod/dailyTask/DailyTask.go

@@ -107,8 +107,8 @@ func (dt *DailyTaskMod) WeekUpdate() {
 	dt.WeekReward = weekReward
 }
 
-func (dt *DailyTaskMod) Trigger(Tr *quest.Trigger, Unlock bool) bool {
-	if !Unlock {
+func (dt *DailyTaskMod) Trigger(Tr *quest.Trigger) bool {
+	if !dt.Lock {
 		return false
 	}
 	update := false

src/server/middleware/kafka/kafka.go

@@ -10,46 +10,11 @@ import (
 )
 
 var KafkaMod *kafka.Writer
-var topic string
 
 func init() {
 	if conf.Server.GameName == "pet_home_local" {
 		return
 	}
-	topic = conf.Server.GameName
-
-	// Create a Kafka connection to the broker
-	conn, err := kafka.Dial("tcp", fmt.Sprintf("%s:%s", conf.Server.KafkaHost, conf.Server.KafkaPort))
-	if err != nil {
-		log.Debug("Failed to connect to Kafka broker: %v", err)
-		return
-	}
-	defer conn.Close()
-
-	// Check if topic exists, create if not
-	partitions, err := conn.ReadPartitions()
-	if err != nil {
-		log.Debug("Failed to read partitions: %v", err)
-		return
-	}
-	exists := false
-	for _, p := range partitions {
-		if p.Topic == topic {
-			exists = true
-			break
-		}
-	}
-	if !exists {
-		err = conn.CreateTopics(kafka.TopicConfig{
-			Topic:             topic,
-			NumPartitions:     1,
-			ReplicationFactor: 1,
-		})
-		if err != nil {
-			log.Debug("Failed to create topic: %v", err)
-			return
-		}
-	}
 	KafkaMod = newKafkaWriter(fmt.Sprintf("%s:%s", conf.Server.KafkaHost, conf.Server.KafkaPort), conf.Server.GameName)
 	log.Debug("KafkaMod init")
 }