Commit Graph

331 Commits

Author SHA1 Message Date
xinian
f6aa0c3339 feat: 重构任务奖励系统并增加宠物技能和皮肤奖励
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
将任务奖励逻辑重构到单独的文件中,增加对宠物技能和皮肤奖励的支持,优化任务完成处理流程
2026-04-11 19:25:59 +08:00
xinian
0daeb70900 fix: 修复日志格式化字符串错误和任务奖励逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-10 10:28:22 +08:00
昔念
0051ac0be8 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 添加旧组队协议支持并优化战斗系统

- 实现了旧组队协议相关功能,包括GroupReadyFightFinish、GroupUseSkill、
  GroupUseItem、GroupChangePet和GroupEscape方法
- 新增组队战斗相关的入站信息结构体定义
- 实现了组队BOSS战斗逻辑,添加groupBossSlotLimit常量
- 重构宠物技能设置逻辑,调整金币消耗时机
- 优化战斗循环逻辑,添加对无行动槽位的处理
- 改进AI行动逻辑,增加多位置目标选择
2026-04-08 01:28:55 +08:00
昔念
918cdeac0e Merge branch 'main' of https://cnb.cool/blzing/blazing 2026-04-07 17:26:52 +08:00
xinian
77057e01b6 refactor: 优化命令注册和请求处理逻辑 2026-04-06 07:07:15 +08:00
xinian
f030b61645 fix: 优化TCP/WebSocket协议检测与处理逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-06 06:33:24 +08:00
xinian
40ec827342 refactor: 重构战斗属性和特效应用逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-06 03:11:38 +08:00
xinian
c021b40fbe feat: 增强踢人逻辑与BOSS脚本支持
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
优化踢人超时处理和僵尸连接清理,支持BOSS动作脚本并增加测试,修复事件匹配与战斗循环中的并发问题。
2026-04-05 21:59:22 +08:00
昔念
c3da3162ee ```
feat(player): 添加玩家断开连接时的安全保存机制

- 实现 SaveOnDisconnect 方法,确保玩家数据在断开连接时安全保存
- 添加并发控制防止重复保存操作,使用互斥锁和完成通道确保一次保存
- 在 socket 关闭事件中改为异步调用 SaveOnDisconnect 避免阻塞
- 添加 panic 恢复机制保护保存过程中的异常情况

refactor(login): 优化登录时的踢人逻辑和超时处理
2026-04-05 11:14:25 +08:00
xinian
37cd641942 refactor: 重构 Prop 字段位置至 baseplayer
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-04-05 07:45:51 +08:00
xinian
87145579e6 refactor: 移除宠物显示提供者接口
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-04-05 07:41:50 +08:00
xinian
2ee0cbc094 fix: 修复boss奖励发放逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-05 07:28:39 +08:00
xinian
8352d23164 refactor: 优化精灵背包仓库切换逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-05 06:02:27 +08:00
xinian
e71971d0b4 refactor: 重构宠物背包逻辑到玩家服务
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-05 05:47:25 +08:00
xinian
bceb7965f7 refactor: 重构宠物仓库列表获取逻辑 2026-04-05 05:32:39 +08:00
xinian
7d054bbe91 feat: 实现跨服PVP匹配和战斗功能 2026-04-05 05:04:04 +08:00
c378d3d5f7 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(admin): 宠物管理功能优化

- 清理宠物控制器中的乱码字符
- 更新宠物获取请求结构体字段注释为英文描述
- 重构变量命名提高代码可读性
- 添加宠物存储信息服务方法
- 优化错误提示信息为英文
- 新增宠物等级查询接口
- 改进宠物购买逻辑验证
```
2026-04-03 12:18:07 +08:00
xinian
218e23ff81 refactor: 重构战斗系统动作提交和竞技场锁定逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-04-02 23:05:18 +08:00
昔念
5995f0670c ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(game): 实现扭蛋系统批量物品添加功能并优化地图逻辑

- 新增ItemAddBatch方法用于批量添加物品,支持普通道具和特殊道具的分别处理
- 优化扭蛋游戏玩法中的物品添加逻辑,使用新的批量接口提升性能
- 在扭蛋机器人命令中实现完整的物品检查和批量添加流程

refactor(map): 重构地图控制器代码结构并添加注释

- 为EnterMap、LeaveMap、GetMapPlayerList等方法添加中文注释
- 统一地图相关的命名规范,如enter
2026-04-01 20:10:29 +08:00
昔念
81c16590d6 ```
feat(pet): 实现宠物展示功能和稀有宠物塔配置

- 添加PetDisplay字段到Player结构体,用于管理宠物展示状态
- 实现PlayerShowPet方法,支持宠物展示逻辑,包括设置展示标识、
  检查宠物存在性并返回相应错误码
- 在Space中添加RefreshUserInfo方法,用于刷新用户信息并应用
  宠物展示信息到SimpleInfo
- 扩展SimpleInfo结构体,添加PetRide字段用于宠物骑乘标识
2026-04-01 02:48:09 +08:00
xinian
d6d03a576d refactor: 优化代码结构和逻辑 2026-03-31 08:19:53 +08:00
xinian
875ad668aa feat: 实现战斗效果逻辑和接口重构
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-28 21:57:22 +08:00
xinian
40411ba84b fix: 修复商品购买和服务相关逻辑问题
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 12:56:29 +08:00
昔念
619e4b50ca ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(pet): 重构宠物服务方法命名和优化数据库操作

- 统一PetService中方法命名规范,将驼峰命名改为标准驼峰格式
- 修复拼写错误:UPdate -> Update, UPdateFree -> UpdateFree等
- 重命名查询方法:PetInfo_One -> PetInfoOneByCatchTime,
  PetInfo_One_ID -> PetInfoOneByID, PetInfo_One_ohter -> PetInfoOneOther
- 优化BuyPet方法中的事务处理逻辑,使用
2026-03-26 04:51:36 +08:00
昔念
1f614e4904 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(player): 优化宠物信息获取逻辑

在GetPetInfo方法中添加必要的空行以提高代码可读性,
确保代码结构更清晰易维护。
```
2026-03-25 23:29:52 +08:00
xinian
09d58c1f14 fix: 修正宠物面板计算参数 2026-03-23 22:00:05 +08:00
xinian
65f696dfc3 refactor: 将 CanFight 方法移至基类
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-23 01:03:49 +08:00
xinian
9380bac839 fix: 修正宠物等级限制逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-23 01:02:49 +08:00
xinian
4fb5653c28 refactor: 重构战斗初始化传递宠物列表
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-22 23:41:51 +08:00
昔念
90b62b44e4 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(common): 统一Redis连接方式并优化代码结构

- 将 g.Redis("cool").Conn(ctx) 统一改为 Redis.Conn(ctx) 的调用方式
- 在coolconfig中添加ServerList.GetID()方法用于生成服务器唯一标识
- 引入gconv包用于类型转换操作

feat(rpc): 完善ListenFight函数实现集群消息监听

- 新增ListenFight函数,完全对齐ListenFunc
2026-03-20 04:58:23 +08:00
昔念
b558f46d7a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(game): 宠物融合系统添加物品消耗异常处理

- 在宠物融合过程中添加物品扣除失败的错误检查
- 当物品不足时返回ErrInsufficientItems错误码

fix(pet): 宠物仓库管理功能增加数据库操作错误处理

- 在宠物释放到仓库和从仓库取出时验证数据库更新结果
- 添加宠物背包切换功能的错误检查机制

feat(fight):
2026-03-19 14:50:11 +08:00
昔念
a3db0c5500 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 改进怪物生成逻辑支持多配置遍历

修改了Monster.go中的GenMonster函数,将原来的随机选择单个配置改为遍历所有配置,
确保每个符合条件的配置都有机会被处理。同时保持了原有的等级范围、特殊属性设置
和NPC战斗处理逻辑。

BREAKING CHANGE: 怪物生成机制从单一随机选择改为配置遍历匹配
```
2026-03-17 18:24:50 +08:00
xinian
a47b35df88 refactor: 优化怪物生成逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 14:14:03 +08:00
昔念
d74652373c ```
refactor(socket): 更新广播和退出逻辑中的类型引用

更新socket服务器中广播功能和退出功能的代码,
将player.Player类型替换为player.ClientData类型,
并相应调整方法调用以适应新的数据结构。

feat(map): 添加LoadOrStore方法支持

在并发安全的swiss map中新增LoadOrStore方法,
提供原子性的加载或存储功能,增强map的操作能力。

refactor(login): 优化登录逻辑中的玩家获取方式

重构登录控制器中获取玩家对象的方式,
直接从
2026-03-16 22:30:12 +08:00
xinian
af09d1ae86 refactor: 优化RPC对战加入与
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-12 14:35:27 +08:00
昔念
a29a8ddec2 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(service): 宠物添加功能增加销售计数参数并优化价格更新逻辑

- 修改PetAdd方法签名,增加salecount参数用于追踪宠物销售次数
- 在多个控制器中统一调用PetAdd方法时传入0作为初始销售次数
- 临时禁用寒流枪活动中的宠物发放功能
- 优化UPdatePrice方法,添加错误处理和价格范围验证逻辑
- 调整宠物购买逻辑,使用免费金币系统并计算递增购买
2026-03-11 12:19:13 +08:00
xinian
b80b017d33 fix: 修正任务状态判断与初始化逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 15:20:19 +08:00
昔念
4751594ee8 ```
feat: 更新战斗系统模型结构和Redis消息处理

- 引入gredis依赖用于Redis消息处理
- 将战斗相关的枚举和结构体从info包迁移到model包
- 更新战斗结束原因、攻击值等类型的引用路径
- 添加新的zset工具包到工作区
- 修改Redis消息处理逻辑以正确解析gredis.Message类型
- 在战斗控制器中统一使用model包下的类型定义
2026-03-04 22:47:21 +08:00
昔念
55a5534777 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight_pvp_king): 新增宠物王者对战模式支持

- 添加战斗类型11的处理逻辑,支持单人模式
- 验证宠物类型与对战类型的匹配性
- 根据战斗结果发放相应奖励物品
- 增加ItemAdd接口用于物品添加功能
- 扩展PetInfo结构体增加战斗类型字段
```
2026-03-04 20:21:02 +08:00
昔念
bf79c0fd6a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(fight): 移除调试打印语句并优化阻塞策略

移除了effect_attr.go中的调试println语句,将注释掉相关的日志输出,
同时在pack.go中更新了锁策略,从SleepBlockStrategy切换到
ConditionBlockStrategy,并移除了未使用的time包导入
```
2026-03-04 14:45:52 +08:00
昔念
fc8fc1ed8d ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(socket): 使用bytebufferpool优化内存分配并重构消息处理机制

引入bytebufferpool减少内存分配开销,在ServerEvent.go中修改数据处理逻辑,
将直接的数据拷贝改为使用缓冲池。同时移除原有的消息通道机制,改用lock
2026-03-04 14:00:55 +08:00
昔念
3f59f1a353 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(boss-fight): 调整宠物战斗奖励逻辑

修复闪亮怪物奖励物品的位置,将奖励物品发放逻辑从条件判断前移到判断后,
确保只有符合条件的玩家才能获得玄铁奖励。

fix(player-energy): 修复能量时间消耗问题

注释掉EnergyTime的自动减1逻辑,避免玩家能量值异常减少。

refactor(shop-config): 优化商店查询配置

移除商品名称字段查询,只保留remark字段作为关键词搜索,
简化商品表的SELECT语句,提高查询效率。
```
2026-03-04 12:48:49 +08:00
昔念
aefef6a456 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复玩家ID记录错误

当处理客户端消息时发生panic错误,日志中记录的玩家ID应该是当前客户端数据中的
玩家ID(cd.Player.Info.UserID),而不是错误引用的h.Player.Info.UserID。

这确保了错误日志能够正确关联到实际出错的玩家。
```
2026-03-04 01:38:24 +08:00
昔念
536a0c45c8 ```
refactor(player): 修复消费消息协程中的变量引用错误

修复了 consumeMsg 方法中错误引用变量的问题,将 handleBizLogic 方法中的
变量引用从 'h' 更正为 'cd',确保正确的上下文访问。

同时调整了代码结构,将消息循环处理逻辑移至正确位置,
保证 panic 恢复机制能够正确捕获异常信息。
```
2026-03-04 01:38:12 +08:00
昔念
dffd6a63a6 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 优化客户端数据处理机制

重构ClientData的消息处理流程,将OnEvent方法改为非阻塞的通道投递模式,
新增MsgChan用于异步消息传递,避免eventloop阻塞问题。

fix(fight): 修复宠物闪光属性过滤条件

在initplayer方法中增加color.Alpha不为0的判断条件,确保只有有效的
闪光属性才会被添加到宠物信息中。

refactor(socket): 调整服务器事件处理逻辑

移除未使用的Lockfree库依赖,注释掉不再需要的连接关闭资源释放代码,
调整事件处理的工作池提交逻辑。

feat(rpc): 新增Redis发布功能

为RPC_player添加SendPackCmd方法,通过Redis的publish命令实现
跨服数据传输功能。
```
2026-03-04 01:30:40 +08:00
昔念
1cbe5d60e7 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 启用panic恢复机制处理客户端事件

在ClientData的OnEvent方法中启用defer函数来捕获和处理panic异常,
确保程序在遇到运行时错误时能够正常记录日志并继续运行,提高服务稳定性。

当发生panic时,会记录服务器ID、用户ID和错误信息到日志中。
```
2026-03-03 23:42:23 +08:00
昔念
0c7fd18bc9 ```
feat(controller): 增强命令注册逻辑并修复试炼塔关卡限制

- 在命令注册时检查重复方法,如果存在则panic提示错误
- 移除CurrentFreshStage和CurrentStage的默认值设置逻辑
- 添加关卡等级验证,确保用户不能挑战超过最大关卡数的关卡
- 修复试炼之塔和勇者之塔的关卡计算逻辑

fix(item): 修复道具使用返回值类型转换问题

- 将ThreeTimes和TwoTimes字段从int32转为uint32返回
- 为能量吸收道具使用函数添加结果结构体初始化

refactor(fight): 清理战斗服务中的注释和字段定义

- 移除C2S_FRESH_CHOICE_FIGHT_LEVEL结构体中冗余的注释说明
- 统一FightOverInfo结构体的格式

fix(item): 修复宠物道具使用的条件判断

- 为道具300790添加DV值大于等于31时不能使用的限制

fix(player): 修复玩家经验加成次数的判断逻辑

- 将TwoTimes和ThreeTimes的判断从不等于0改为大于0
- 将EnergyTime的判断从不等于0改为大于0
- 统一所有次数字段的类型为int32以避免负数问题

chore(admin): 清理无用代码

- 移除未使用的context包导入
- 注释掉未完成的TimeMap接口实现
```
2026-03-03 23:40:21 +08:00
昔念
5caa9a1e4f ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(controller): 增强命令注册逻辑并修复试炼塔关卡限制

- 在命令注册时检查重复方法,如果存在则panic提示错误
- 移除CurrentFreshStage和CurrentStage的默认值设置逻辑
- 添加关卡等级验证,确保用户不能挑战超过最大关卡数的关卡
- 修复试炼之塔和勇者之塔的关卡计算逻辑

fix(item): 修复道具
2026-03-03 19:28:59 +08:00
昔念
7b8251214b ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
fix(player): 修复怪物生成时PitS为空导致的崩溃问题

当玩家切换地图时,PitS可能为nil,此时访问会导致程序崩溃。
添加空值检查以避免此问题。
```
2026-03-03 00:31:36 +08:00
昔念
79d4343cdc ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(common/cool): 更新GetClient函数支持端口参数

更新GetClient函数签名以接收端口参数,并修改客户端映射键的计算方式,
添加GetClientOnly函数用于仅通过uid获取客户端。

fix(common/rpc): 修复RPC调用中的客户端获取方法

将GetClient调用替换为GetClientOnly,确保正确的客户端获取逻辑。

refactor(logic/controller): 重命名Port字段为UID并优化道具列表处理

将Controller结构体中的Port字段重命名为UID以更好地反映其用途,
优化GetUserItemList函数中道具列表的初始化和填充逻辑。

perf(logic): 调整性能分析web服务启动位置

将PprofWeb服务从全局启动移至调试模式下启动,优化服务配置。

refactor(logic/server): 更新服务器UID生成逻辑

修改Maincontroller的UID字段设置方式,使用服务器ID和端口组合生成唯一标识。

refactor(logic/service/player): 移除未使用的导入并优化怪物生成

移除未使用的service导入,优化怪物生成逻辑中的地图数据访问。

feat(logic/service/space): 添加PitS缓存映射并重构空间初始化

添加新的PitS字段
2026-03-02 23:59:15 +08:00