1

logic/service/player/Monster.go

@@ -3,6 +3,7 @@ package player
 import (
 	"blazing/common/data/xmlres"
 	"blazing/cool"
+	"blazing/modules/config/service"
 	"strings"
 	"sync/atomic"
 	"time"
@@ -25,6 +26,11 @@ func (p *Player) GenMonster() {
 	if atomic.LoadUint32(&p.Canmon) == 0 { //已经进入地图或者没在战斗中，就可以刷新怪
 		return
 	}
+
+	mapinfo := service.NewMapService().GetData(p.Info.MapID)
+	if mapinfo == nil {
+		return
+	}
 	var oldnum, newNum int
 	var replce []int
 	p.monsters, oldnum, newNum = replaceOneNumber(p.monsters)
@@ -40,7 +46,7 @@ func (p *Player) GenMonster() {
 	mapss, ok := xmlres.MonsterMap[gconv.Int(p.Info.MapID)]
 
 	if ok && mapss.Monsters != nil {
-		ok, _, _ := p.PlayerCaptureContext.Roll(mapss.Monsters.WildBonusProb, mapss.Monsters.WildBonusTotalProb)
+		ok := grand.Meet(3, 10)
 		for i, m := range mapss.Monsters.Monsters { //这里是9个
 
 			_, rok := lo.Find(replce, func(it int) bool {
@@ -77,12 +83,12 @@ func (p *Player) GenMonster() {
 				if cool.Config.ServerInfo.IsVip != 0 { //测试服,百分百异色
 					p.OgreInfo.Data[i].RandomByWeightShiny()
 				}
-				if xmlres.PetMAP[int(p.OgreInfo.Data[i].ID)].CatchRate != 0 && grand.Meet(1, 500) {
+				if xmlres.PetMAP[int(p.OgreInfo.Data[i].ID)].CatchRate != 0 {
 					p.OgreInfo.Data[i].RandSHiny()
 				}
 				if ok {
 
-					p.OgreInfo.Data[i].Item = int64(mapss.Monsters.ItemBonusID)
+					p.OgreInfo.Data[i].Item = int64(mapinfo.DropItemIds[grand.Intn(len(mapinfo.DropItemIds))])
 
 				}
 			}

logic/service/player/wscodec.go

@@ -65,7 +65,7 @@ func (w *WsCodec) Upgrade(c gnet.Conn) (ok bool, action gnet.Action) {
 	}
 	tmpReader := bytes.NewReader(buf.Bytes())
 	oldLen := tmpReader.Len()
-	logging.Infof("do Upgrade")
+	//logging.Infof("do Upgrade")
 
 	hs, err := ws.Upgrade(readWrite{tmpReader, c})
 	skipN := oldLen - tmpReader.Len()