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

worldsrv/etcd.go

@@ -93,80 +93,10 @@ func init() {
 	etcd.Register(etcd.ETCDKEY_MatchAudience, webapi.MatchAudience{}, handlerEvent)
 	// 小精灵配置
 	etcd.Register(etcd.ETCDKEY_Spirit, webapi.SpiritConfig{}, platformConfigEvent)
-
+	// 竞技馆房间配置
-	PlatformMgrSingleton.GetConfig("1").RoomType = map[int32]*webapi.RoomType{
+	etcd.Register(etcd.ETCDKEY_RoomConfig, webapi.RoomConfig{}, handlerEvent)
-		1: {
+	// 竞技馆房间类型配置
-			Platform: "1",
+	etcd.Register(etcd.ETCDKEY_RoomType, webapi.RoomType{}, handlerEvent)
-			Id:       1,
-			Name:     "{\"zh\":\"话费赛\",\"kh\":\"话费赛\",\"vi\":\"话费赛\",\"en\":\"话费赛\"}",
-			On:       1,
-			SortId:   1,
-		},
-		2: {
-			Platform: "1",
-			Id:       2,
-			Name:     "{\"zh\":\"物品赛\",\"kh\":\"物品赛\",\"vi\":\"物品赛\",\"en\":\"物品赛\"}",
-			On:       1,
-			SortId:   2,
-		},
-	}
-
-	PlatformMgrSingleton.UpdateRoomConfig(&webapi.RoomConfig{
-		Platform: "1",
-		Id:       1,
-		Name:     "{\"zh\":\"1元话费赛\",\"kh\":\"1元话费赛\",\"vi\":\"1元话费赛\",\"en\":\"1元话费赛\"}",
-		RoomType: 1,
-		On:       1,
-		SortId:   1,
-		Cost: []*webapi.ItemInfo{
-			{
-				ItemId:  100001,
-				ItemNum: 12,
-			},
-		},
-		Reward: []*webapi.ItemInfo{
-			{
-				ItemId:  100001,
-				ItemNum: 12,
-			},
-		},
-		OnChannelName: []string{common.ChannelOfficial, common.ChannelWeb, common.ChannelGooglePlay},
-		GameFreeId:    []int32{2150001, 2160001, 2170001, 2180001},
-		Round:         []int32{1, 2, 3, 4},
-		PlayerNum:     []int32{2, 3, 4},
-		NeedPassword:  3,
-		CostType:      3,
-		Voice:         3,
-		ImageURI:      "",
-	})
-	PlatformMgrSingleton.UpdateRoomConfig(&webapi.RoomConfig{
-		Platform: "1",
-		Id:       2,
-		Name:     "{\"zh\":\"2元话费赛\",\"kh\":\"2元话费赛\",\"vi\":\"2元话费赛\",\"en\":\"2元话费赛\"}",
-		RoomType: 1,
-		On:       1,
-		SortId:   2,
-		Cost: []*webapi.ItemInfo{
-			{
-				ItemId:  100001,
-				ItemNum: 12,
-			},
-		},
-		Reward: []*webapi.ItemInfo{
-			{
-				ItemId:  100001,
-				ItemNum: 12,
-			},
-		},
-		OnChannelName: []string{common.ChannelOfficial, common.ChannelWeb, common.ChannelGooglePlay},
-		GameFreeId:    []int32{2150001, 2160001, 2170001, 2180001},
-		Round:         []int32{1, 2, 3, 4},
-		PlayerNum:     []int32{2, 3, 4},
-		NeedPassword:  3,
-		CostType:      3,
-		Voice:         3,
-		ImageURI:      "",
-	})
 }
 
 func platformConfigEvent(ctx context.Context, completeKey string, isInit bool, event *clientv3.Event, data interface{}) {

worldsrv/scene.go

@@ -514,8 +514,6 @@ func (this *Scene) lastScene(p *Player) {
 }
 
 func (this *Scene) DelPlayer(p *Player) bool {
-	FirePlayerLeaveScene(p, this)
-	this.sp.OnPlayerLeave(this, p)
 	if p.scene != this {
 		roomId := 0
 		if p.scene != nil {
@@ -556,6 +554,8 @@ func (this *Scene) DelPlayer(p *Player) bool {
 	if !p.IsRob {
 		this.lastTime = time.Now()
 	}
+	FirePlayerLeaveScene(p, this)
+	this.sp.OnPlayerLeave(this, p)
 	return true
 }