Merge branch 'develop' into sdk

src/server/game/champship_mgr.go

@@ -608,16 +608,16 @@ func (c *ChampshipMgr) inRank(m *msg.Msg) (interface{}, error) {
 	inRank := false
 	notify := make(map[int]int)
 	for k, v := range rankList {
+		notify[v.Uid] = k
 		if v.Uid == data.Uid {
 			if v.Score < data.Score {
 				v.Score = data.Score
 				v.Time = GoUtil.Now()
 				inRank = true
-				break
+			} else {
+				return nil, nil
 			}
-			return nil, nil
 		}
-		notify[v.Uid] = k
 	}
 	if !inRank {
 		rankList = append(rankList, &ChampshipRank{
@@ -652,6 +652,7 @@ func (c *ChampshipMgr) inRank(m *msg.Msg) (interface{}, error) {
 			End:  GoUtil.Now() + onehour,
 		})
 	}
+	c.SetRankCache(data.Uid)
 	return nil, nil
 }
 

src/server/game/message_handler.go

@@ -333,9 +333,7 @@ func (p *Player) handle(m *msg.Msg) error {
 			m.Item[0].Num = min(m.Item[0].Num, starNum)
 			if m.Item[0].Num >= starNum && gameId == playroom.GAME_TYPE_FILP {
 				bankruptcy = true
-				if m.Item[0].Num > 0 {
-					p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_BANKRUPTCY, fmt.Sprintf("%d", m.Item[0].Num), m.SendT)
-				}
+				p.AddLog(m.From, friend.LOG_TYPE_PLAYROOM_BANKRUPTCY, fmt.Sprintf("%d", m.Item[0].Num), m.SendT)
 			}
 			p.HandleLoseItem(m.Item, "HANDLE_TYPE_PLAYROOM_LOSE")
 		} else {

src/server/game/mod/order/Order.go

@@ -430,6 +430,7 @@ func (o *OrderMod) CreateNormalOrder(lv int, emit []int, energyMul, orderType in
 		}
 		break
 	}
+	fmt.Printf("生成订单的棋子列表:%v, 难度:%d\n", mergeList, OrderDiff)
 	for _, v := range mergeList {
 		if v == 0 {
 			return nil
@@ -733,7 +734,15 @@ func (o *OrderMod) ChangeEnergyMul(lv int, emit []int, energyMul int, chessList
 		*/
 		if needTrigger {
 			delete(o.OrderList, k)
-			o.CreateNormalOrder(lv, emit, energyMul, v.Type)
+			newEmit := make([]int, len(emit))
+			if v.Type == Part_type {
+				for _, v := range emit {
+					if mergeDataCfg.GetEmitType(v) != "auto" {
+						newEmit = append(newEmit, v)
+					}
+				}
+			}
+			o.CreateNormalOrder(lv, newEmit, energyMul, v.Type)
 		}
 	}
 }

src/server/test/fix_test.go

@@ -123,7 +123,7 @@ func TestEndless(t *testing.T) {
 
 func TestAdmin(t *testing.T) {
 	player := new(game.Player)
-	player.M_DwUin = 100100626
+	player.M_DwUin = 100100001
 	player.InitPlayerOnly()
 	player.ZeroUpdate(nil)
 }

src/server/test/order_test.go

@@ -74,11 +74,11 @@ func TestAddNormalOrder(t *testing.T) {
 
 func TestAddPartOrder(t *testing.T) {
 	p1 := new(game.Player)
-	p1.InitPlayer("3625212")
+	p1.InitPlayer("bbb004")
 	OrderMod := p1.GetOrderMod()
 	BaseMod := p1.GetBaseMod()
 	ChessMod := p1.GetChessMod()
-	for i := 0; i < 10; i++ {
+	for i := 0; i < 1000; i++ {
 		OrderMod.CreateOrder(BaseMod.GetLevel(), ChessMod.GetOrderPartEmit(), BaseMod.GetEnergyMul(), order.Part_type)
 	}
 }