锦标赛优化

src/server/game/activity_mgr.go

@@ -196,9 +196,6 @@ func (r *ActivityMgr) Reload() error {
 		}
 	}()
 	G_GameLogicPtr.NotifyAll(&Msg.Msg{Type: Msg.HANDLE_TYPE_ACTIVITY_RELOAD})
-	if G_GameLogicPtr.ChampshipMgr != nil {
-		G_GameLogicPtr.ChampshipMgr.ReloadActivity()
-	}
 	return nil
 }
 

src/server/game/admin.go

@@ -326,7 +326,12 @@ func ReqAdminBan(args []interface{}) error {
 }
 
 func AcitivityCfgReload() {
-	G_GameLogicPtr.ActivityMgr.Reload()
+	if G_GameLogicPtr.ActivityMgr != nil {
+		G_GameLogicPtr.ActivityMgr.Reload()
+	}
+	if G_GameLogicPtr.ChampshipMgr != nil {
+		go G_GameLogicPtr.ChampshipMgr.ReloadActivity()
+	}
 }
 
 func AdminShipping(req *msg.ReqOrderShipping) (*msg.ResOrderShipping, error) {

src/server/game/champship_mgr.go

@@ -184,26 +184,20 @@ func (c *ChampshipMgr) ZeroNotifyAll() (interface{}, error) {
 }
 
 func (c *ChampshipMgr) ReloadActivity() {
-	log.Debug("ChampshipMgr ReloadActivity")
 	activityCfg := G_GameLogicPtr.ActivityMgr.GetActivityListByType(activity.ACT_TYPE_CHAMPION)
 	log.Debug("championship reload activity %v", activityCfg)
 	if activityCfg.AId == 0 {
 		log.Debug("championship reload activity failed, no active, aid:%d", activityCfg.AId)
 		return
 	}
-	log.Debug("step1")
 	t := dispterTimer["zero"]
 	if t != nil {
 		t.Stop()
 	}
-	log.Debug("step2")
-
 	timeDuration := activityCfg.Endtime - GoUtil.Now()
 	t = c.mDispatr.AfterFunc(time.Duration(timeDuration)*time.Second, func() {
 		c.ZeroUpdate()
 	})
-	log.Debug("step3")
-
 	dispterTimer["zero"] = t
 	log.Debug("ChampshipMgr reload activity success, activity endtime:%d, now:%d, remain:%d, next zero update time:%s", activityCfg.Endtime, GoUtil.Now(), activityCfg.Endtime-GoUtil.Now(), GoUtil.FormatTime(activityCfg.Endtime))
 }