diff --git a/src/server/README.MD b/src/server/README.MD new file mode 100644 index 00000000..42588485 --- /dev/null +++ b/src/server/README.MD @@ -0,0 +1,16 @@ +## 命名规范 + + +- **清晰优先**:名称应准确表达含义,避免歧义。 +- **导出规则**:导出标识符首字母大写,未导出首字母小写。 +- **包名**:小写单词,简短且描述职责(如 `store`、`auth`)。 +- **文件名**:小写(可下划线分隔),测试文件以 `_test.go` 结尾。 +- **函数/变量/类型**:驼峰命名;导出使用 PascalCase(例如 `UserService`、`CreateUser`)。 +- **接口**:以行为命名,常用 `-er` 结尾(如 `Reader`、`Store`),避免 `I` 前缀。 +- **缩写**:统一大小写(例如导出使用 `ID`、`URL`;未导出使用 `id`、`url`)。 +- **错误**:包级错误使用 `Err` 前缀(如 `ErrNotFound`)。 +- **Context 与并发**:统一使用 `ctx` 作 `context.Context`,通道命名要有语义(如 `done`, `jobs`)。 +- **构造函数/选项**:使用 `NewType` 与 `WithXxx` 约定,避免多个布尔参数。 + + + diff --git a/src/server/conf/conf.go b/src/server/conf/conf.go index c41461f0..b66d324d 100644 --- a/src/server/conf/conf.go +++ b/src/server/conf/conf.go @@ -10,8 +10,8 @@ var ( LogFlag = log.LstdFlags | log.Lmicroseconds // gate conf - PendingWriteNum = 65536 - MaxMsgLen uint32 = 65536 // 16KB + PendingWriteNum = 1 << 20 // 1M + MaxMsgLen uint32 = 65536 // 16KB HTTPTimeout = 10 * time.Second LenMsgLen = 2 LittleEndian = false diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go index e57ed313..8f31db9a 100644 --- a/src/server/game/gm_handler.go +++ b/src/server/game/gm_handler.go @@ -151,19 +151,19 @@ func ReqGmCommand_(player *Player, Command string) error { ChessMod.PartBag.List = make(map[int]chess.PartBagGrid) } ChessMod.PartBag.List[1505] = chess.PartBagGrid{ - Num: 10000, + Num: 100, PartId: 1505, } ChessMod.PartBag.List[1515] = chess.PartBagGrid{ - Num: 10000, + Num: 100, PartId: 1515, } ChessMod.PartBag.List[1525] = chess.PartBagGrid{ - Num: 10000, + Num: 100, PartId: 1525, } ChessMod.PartBag.List[1535] = chess.PartBagGrid{ - Num: 10000, + Num: 100, PartId: 1535, } case "AllFace": diff --git a/src/server/game/player_back.go b/src/server/game/player_back.go index 6cf5c34b..2dbcbfc7 100644 --- a/src/server/game/player_back.go +++ b/src/server/game/player_back.go @@ -295,6 +295,11 @@ func (p *Player) ChargeBackData() { func (p *Player) BackChampship() { ChampshipMod := p.PlayMod.getChampshipMod() + MyRank, MyPreRank := p.GetChampshipRank() + p.PushClientRes(ChampshipMod.BackData(MyRank, MyPreRank)) +} + +func (p *Player) GetChampshipRank() (int, int) { MyRank := 0 MyPreRank := 0 res, _ := SendMsgToCenterSync(&msg.Msg{ @@ -305,7 +310,7 @@ func (p *Player) BackChampship() { MyRank = res.Extra.([]int)[0] MyPreRank = res.Extra.([]int)[1] } - p.PushClientRes(ChampshipMod.BackData(MyRank, MyPreRank)) + return MyRank, MyPreRank } // 返回好友信息 diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index 0f124dd8..26dee3cc 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -3148,9 +3148,9 @@ func ReqFriendTReward(player *Player, buf []byte) error { } func ReqChampshipRankReward(player *Player, buf []byte) error { - MyLastRank := G_GameLogicPtr.ChampshipMgr.getLastMyRank(int(player.M_DwUin)) + _, myPreRank := player.GetChampshipRank() ChampshipMod := player.PlayMod.getChampshipMod() - itemList, err := ChampshipMod.GetRankReward(MyLastRank) + itemList, err := ChampshipMod.GetRankReward(myPreRank) if err != nil { player.SendErrClienRes(&msg.ResChampshipRankReward{ Code: msg.RES_CODE_FAIL, @@ -3166,9 +3166,9 @@ func ReqChampshipRankReward(player *Player, buf []byte) error { }) return err } - if MyLastRank <= 5 { + if myPreRank <= 5 { FriendMod := player.PlayMod.getFriendMod() - FriendMod.AddActLog(friend.ACT_LOG_TYPE_GET_CHAMPIONSHIP_RANK, GoUtil.String(MyLastRank)) + FriendMod.AddActLog(friend.ACT_LOG_TYPE_GET_CHAMPIONSHIP_RANK, GoUtil.String(myPreRank)) } player.PlayMod.save() player.BackChampship() @@ -3177,7 +3177,7 @@ func ReqChampshipRankReward(player *Player, buf []byte) error { }) player.TeLog("championship_reward", map[string]interface{}{ "season_id": GoUtil.ZeroTimestamp() - 86400, - "champship_step_id": MyLastRank, + "champship_step_id": myPreRank, "reward_type": "rank", "item_list": itemList, "champship_score": ChampshipMod.Score,