Commit Graph

548 Commits

Author SHA1 Message Date
xinian
99748ba41e refactor: 重构奖励发放逻辑并支持签到默认奖励
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-04-06 03:42:48 +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
5b37d9493b feat: 实现每日签到功能并优化战斗和道具逻辑 2026-04-06 02:06:11 +08:00
xinian
f433a26a6d refactor: 重构战斗系统为统一动作包结构
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-06 00:58:23 +08:00
xinian
d83cf365ac 更新说明
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-04-05 23:13:06 +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
xinian
7ec6381cf1 111 2026-04-05 07:30:55 +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
6510e4e09b refactor: 重构入参类型引用
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-05 07:24:36 +08:00
xinian
34bc35a6b2 feat: 新增游戏协议入站结构体定义
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-05 06:12:32 +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
c3f052ef30 refactor: 移除 syncBackupPetList 调用和定义 2026-04-05 05:24:55 +08:00
xinian
7d054bbe91 feat: 实现跨服PVP匹配和战斗功能 2026-04-05 05:04:04 +08:00
xinian
78a68148ce chore: update fight logic and effect implementations
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-04-05 02:25:44 +08:00
xinian
fbc845526b refactor: 优化控制器初始化和命令解析逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-04 09:33:31 +08:00
xinian
b62b4af628 style: 清理代码注释和格式 2026-04-04 05:12:30 +08:00
xinian
3c160ef695 feat: 新增精灵仓库管理及战斗特效逻辑 2026-04-03 00:02:51 +08:00
xinian
c19ee7de03 fix: 修复战斗动作提交逻辑 2026-04-03 00:02:34 +08:00
xinian
218e23ff81 refactor: 重构战斗系统动作提交和竞技场锁定逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-04-02 23:05:18 +08:00
昔念
6aa601bb06 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-04-02 10:23:07 +08:00
昔念
f810a2ae86 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 宠物系统重构和功能增强

- 修复战斗boss中effect ID索引错误问题
- 实现宠物仓库和背包管理功能
- 添加宠物列表排序保存功能
- 重构宠物备份列表同步逻辑
- 优化宠物释放和获取逻辑
- 添加宠物背包仓库切换功能
- 修复地图模型广播信息结构问题
- 调整宠物特效数据库查询逻辑
```
2026-04-02 07:49:49 +08:00
昔念
3a13bcc99c ```
feat(game): 实现扭蛋系统批量物品添加功能并优化地图逻辑

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

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

- 为EnterMap、LeaveMap、GetMapPlayerList等方法添加中文注释
- 统一地图相关的命名规范,如enter map替换进入地图
- 调整地图玩家列表中BOSS广播命令ID,2021和2022进行对调

refactor(boss): 重构定时BOSS代码并优化注释

- 将原有的中文注释改为英文注释,统一代码风格
- 简化TimeBossRule结构体定义和相关配置
- 优化定时任务注册逻辑,去除冗余的注释和变量

refactor(space): 清理地图空间服务代码注释

- 移除多余的中文注释和说明文字
- 统一代码格式,移除不必要的空行和注释
- 保持原有的天气系统和地图刷怪逻辑不变

fix(role): 修复系统角色权限查询逻辑

- 修改BaseSysRoleService中的查询条件,正确处理管理员权限
- 使用Extend方法替代Where进行复杂的权限判断逻辑
- 确保超级管理员可以访问所有角色,其他用户受限于权限范围

refactor(dict): 添加字典服务批量查询方法

- 新增GetMaxMap方法用于批量获取物品最大持有上限
- 优化数据库查询,减少多次单个查询的开销
- 支持一次请求多个物品的最大数量限制

fix(player): 修复玩家信息保存异常处理

- 将panic方式改为错误日志记录,避免程序崩溃
- 优化Save方法的重试逻辑,统一错误处理方式
- 在本地文件回退时记录详细错误信息

feat(robot): 扩展扭蛋机器人功能

- 添加用户验证和角色创建检查
- 实现批量扭蛋的完整逻辑,支持1-10次抽取
- 集成物品数量检查和批量添加功能
```
2026-04-02 02:33:05 +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
ccb4ad8fdf refactor: 重构宠物信息构建逻辑并新增技能效果 2026-03-31 09:19:36 +08:00
xinian
d6d03a576d refactor: 优化代码结构和逻辑 2026-03-31 08:19:53 +08:00
xinian
b4a8048b85 feat: 添加战斗效果800-814及优化道具逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-31 06:51:40 +08:00
昔念
23027ccfde ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
feat(game): 完善宠物融合逻辑和野外BOSS战斗机制

- 在玩家挑战野外BOSS时添加新的ger变量控制捕捉状态
- 当BOSS被标记为已捕捉(isCapture==1)时同步设置ger为-1
- 将怪物等级参数改为使用ger变量传递
- 重构宠物融合服务的数据处理逻辑
- 优化融合结果的权重随机算法
- 添加默认融合配置的查询方法
- 统一错误处理和返回值逻辑
```
2026-03-30 21:03:00 +08:00
xinian
61ccbc6c62 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-28 16:56:00 +08:00
昔念
d55c96e383 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(database): 添加多个玩家相关表的联合唯一约束

- 为player_talk表添加玩家+挖矿联合唯一索引
- 为player_task表添加玩家+任务联合唯一索引
- 为player_title表添加玩家+称号联合唯一索引
- 为player_pet表添加玩家+精灵联合唯一索引
- 为player_cdk_log表添加玩家+CDK联合唯一索引
- 为player_egg表添加玩家孵蛋联合唯一索引
- 为player_pvp表添加PVP索引
- 为player_sign_in_log表添加签到联合唯一索引
- 为player_room_house表添加房间索引

fix(user-talk): 修复获取聊天配置
2026-03-28 02:22:15 +08:00
昔念
06091ff42c ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(item_buy): 优化购买逻辑并添加库存限制功能

- 将变量名 is 改为 ok,提高代码可读性
- 移除未使用的变量 addSuccess
- 重构购买成功逻辑,确保物品添加成功后才扣减金币
- 在 talk.go 中修改判断条件,使用 Limit 字段而非 Type 字段
- 在 user_talk.go 中添加 Limit 字段用于限制数量配置
```
2026-03-28 01:46:52 +08:00
xinian
6767075dcd fix: 修复购买道具数量上限校验逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 16:53:07 +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
昔念
0d2e307021 ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
feat(pet): 修改宠物更新逻辑返回值类型

将PetService.UPdate方法的返回值从error改为bool类型,
并在控制器中相应调整错误处理逻辑,统一使用布尔值判断操作结果。
```
2026-03-26 02:35:43 +08:00
xinian
b3cc06cd38 refactor: 优化蛋卡抽奖逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 01:52:56 +08:00
xinian
0aba7e7ccb refactor: 简化战斗宠物列表处理逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 01:38:02 +08:00
xinian
d8366616e0 feat: 支持单人宠物对战模式
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-23 22:25:07 +08:00
xinian
41a1bfb0c2 fix: 修正PVP对战宠物信息获取错误
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-23 22:21:56 +08:00
xinian
09d58c1f14 fix: 修正宠物面板计算参数 2026-03-23 22:00:05 +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
xinian
4ba8fe32c4 feat: 添加BossConfig战胜规则字段并移除MapNode冗余字段
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 01:06:59 +08:00
xinian
6717ca5236 fix: 修复重复领取奖励的问题
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 01:01:05 +08:00
xinian
1969c01f3e feat: 添加战胜规则配置模块
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 00:57:18 +08:00
xinian
c049bbd5ac fix: 修复登录空指针及战斗效果
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-21 00:24:34 +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
昔念
e7098e3777 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(space): 更新地图BOSS生成逻辑并优化天气变化处理

- 修改GetMapPlayerList方法中BOSS信息发送方式为调用GenBoss方法
- 注释掉Space结构体中的IsChange字段,不再使用该标志位
- 调整GenBoss方法参数,添加isfrist参数用于区分首次调用
- 重构定时任务中的GenBoss调用逻辑,改为匿名函数包装广播消息
- 移除GenBoss
2026-03-18 01:22:14 +08:00