Commit Graph

125 Commits

Author SHA1 Message Date
昔念
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
99af9b6e01 feat: 增加采集限购按日、周、月重置功能
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 13:17:42 +08:00
xinian
40411ba84b fix: 修复商品购买和服务相关逻辑问题
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 12:56:29 +08:00
xinian
f6745bd2a6 fix: 修复代码逻辑错误
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-27 12:10:58 +08:00
昔念
0b2d127faf ```
refactor(pet): 重构宠物服务方法命名和优化数据库操作

- 统一PetService中方法命名规范,将驼峰命名改为标准驼峰格式
- 修复拼写错误:UPdate -> Update, UPdateFree -> UpdateFree等
- 重命名查询方法:PetInfo_One -> PetInfoOneByCatchTime,
  PetInfo_One_ID -> PetInfoOneByID, PetInfo_One_ohter -> PetInfoOneOther
- 优化BuyPet方法中的事务处理逻辑,使用结构体初始化简化代码
- 添加nextCatchTime辅助方法用于生成唯一的捕捉时间戳
- 优化PetAdd方法的实现逻辑,提高代码可读性
- 清理无用注释代码
```
2026-03-26 05:33:40 +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
昔念
5b655c8287 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(pet): 简化UPdate方法的返回逻辑

- 移除不必要的if-else判断语句
- 直接返回err == nil的结果,使代码更简洁
```
2026-03-26 02:36:13 +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
昔念
b60886bae0 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复宠物服务中的数据库查询方法

将宠物服务中UPdate和PetInfo_One方法的数据库查询方法从dbm_fix改为dbm,
以确保使用正确的数据库连接进行查询操作。
```
2026-03-26 02:27:05 +08:00
昔念
ec49d28bd4 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复宠物信息服务中的数据库查询方法

使用正确的数据库管理器方法 dbm_fix 替换原有的 dbm 方法,
以确保宠物信息查询功能正常工作。
```
2026-03-26 00:31:21 +08:00
昔念
fa0ed36363 ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
fix(pet): 修复宠物更新时的数据库模型方法调用错误

将 s.dbm 方法调用更改为 s.dbm_fix,以确保宠物信息更新功能正常工作
```
2026-03-26 00:29:25 +08:00
xinian
e0a82d57b4 fix: 更新宠物状态时处理错误返回 2026-03-25 00:47:53 +08:00
xinian
21830ddf6a fix: 调整汇率上限阈值
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-24 23:40:51 +08:00
xinian
745454daea fix: 调整金豆列表排序为升序
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 08:17:44 +08:00
xinian
bcb7e9f49c feat: 按汇率降序排列金币列表
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-24 08:17:24 +08:00
xinian
356f7e2e19 refactor: 移除未使用的Select字段
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 05:03:31 +08:00
xinian
6f41039c85 feat: 限制挂单汇率
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 04:55:50 +08:00
xinian
d0cf39b439 style: 调整代码格式
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-24 04:43:51 +08:00
昔念
705eb31007 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-23 15:01:13 +08:00
xinian
77c404591a feat: 添加赛尔号机器人行情查询功能
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-23 05:32:43 +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
昔念
5657f1e673 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(pet): 修复宠物数量检查逻辑错误

当free参数为2时,应该查询free字段值为2的记录数量,
而不是查询free字段值为1的记录数量,确保精灵数量限制检查正确。
```
2026-03-19 22:25:10 +08:00
昔念
75c599b5b3 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 添加宠物自由状态管理功能

- 在ServiceList和ServicePage方法中添加WhereNot条件支持
- 将宠物销售状态改为自由状态,新增free字段来标识三种状态:
  0为放入仓库,1为放生,2为上架
- 修改PetInfo、UPdateFree、UPdatePrice等方法以支持新的状态逻辑
- 更新BuyPet方法中的验证逻辑
- 调整查询操作中的字段过滤条件
```
2026-03-19 20:54:52 +08:00
昔念
bd5cd9393a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 优化金币兑换功能

- 在ServiceUpdate方法中返回更新后的数据而不是nil
- 新增DuihuanGold方法用于处理金币兑换逻辑
- 修改黄金列表控制器中的兑换计算逻辑,区分费用和获得金币的计算
- 在添加操作前验证用户金币余额是否充足
- 修正了兑换比例计算和余额检查逻辑
```
2026-03-19 18:36:34 +08:00
昔念
9cc29eec35 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(cool): 添加删除和更新操作的数据影响行数检查

- 在Controller的Delete方法中添加RowsAffected检查,当影响行数为0时返回"not found"错误
- 在Controller的Update方法中添加RowsAffected检查,当影响行数为0时返回"not found"错误
- 修改Service接口定义,将ServiceDelete和ServiceUpdate方法的返回值类型从interface{}改为sql
2026-03-19 17:18:32 +08:00
昔念
baf0d1fc06 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(config): 修复宠物蛋系统中概率计算错误

- 修正了EggService中宠物产出概率计算时错误使用的字段名
- 将pet.OutputMons修正为pet.Probs以正确累加等级权重

refactor(player): 优化金币列表服务参数处理逻辑

- 移除未使用的gconv导入包
- 简化ModifyBefore方法中的用户ID验证逻辑
- 统一设置
2026-03-19 15:08:14 +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
xinian
e2ac5a6325 feat: 增加宠物蛋结果计算和金币检查逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-18 11:14:55 +08:00
xinian
376fa5e8af feat: 新增金豆挂单管理模块及优化购买提示
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 16:56:55 +08:00
xinian
ed8e3327b4 fix: 修正PVP模型PlayerID类型并优化空值处理
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 10:11:10 +08:00
xinian
15ecbcc7de fix: 修正宠物抓捕时间初始化
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-17 10:06:56 +08:00
昔念
ae41e15c1b ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复玩家信息服务中的代码格式和类型错误

- 修复了代码中多余的空格导致的格式问题
- 将saveToLocalFile方法的参数类型从*model.Player更正为*model.PlayerInfo
- 更新了FallbackData结构体中PlayerData字段的类型定义
- 修改了玩家ID获取逻辑,从PlayerID改为UserID以匹配实际数据结构
- 简化了Save方法中的
2026-03-17 00:02:21 +08:00
xinian
3a39abe9c6 refactor: 重构每日重置逻辑条件判断
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-14 12:09:30 +08:00
xinian
4e1fdd6a22 fix: 修复宠物购买重复订单问题
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-14 10:27:26 +08:00
昔念
30dba8fee3 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 完善宠物购买功能的验证逻辑

- 添加宠物信息获取和多重验证检查,包括VIP状态、上架状态、存在性等
- 增强数据库事务操作的错误处理机制
- 优化用户余额扣减和宠物删除的事务安全性
- 修复原代码中查询逻辑的位置错误问题
```
2026-03-14 01:36:06 +08:00
昔念
5ed58b1316 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(boss): 移除alpacadecimal依赖并修复伤害计算逻辑

移除了NewSeIdx_699中对alpacadecimal的依赖,
修复了技能伤害计算方式,不再使用最小值限制

fix(pet): 修正宠物服务中的代码格式和查询逻辑

修正了UPdatePrice方法中的代码格式问题,
为PetService添加了ListQueryOp配置,增加了免费和非VIP宠物的查询条件
```
2026-03-14 01:02:36 +08:00
昔念
47f806d112 Merge branch 'main' of https://cnb.cool/blzing/blazing
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 22:21:01 +08:00
昔念
001c86b724 ```
feat(player): 优化宠物购买功能的数据查询逻辑

- 修改BuyPet方法中的数据库查询方式,使用事务内的模型查询替代直接服务调用
- 添加了更安全的数据库事务处理机制,确保购买操作的数据一致性
- 重构了宠物信息验证逻辑,提升代码可读性和维护性
```
2026-03-13 22:20:54 +08:00
xinian
49b8b6d301 fix: 修复改价条件判断错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 16:06:49 +08:00
xinian
0d44de2ea7 fix: 修复PVP赛季数据结构及相关逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-13 12:04:35 +08:00
昔念
c59ff550a7 Merge branch 'main' of https://cnb.cool/blzing/blazing
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-12 19:34:04 +08:00
昔念
e568de2379 ```
feat(fight): 重构技能效果4和5的实现逻辑

- 移除旧的EffectStat通用结构体
- 为技能4和5创建独立的Effect4和Effect5结构体
- 简化技能触发逻辑,直接使用SideEffectArgs参数
- 技能4现在只影响自身属性,技能5只影响对方属性
- 移除targetOpponent布尔类型判断逻辑

fix(pet): 添加宠物上架数量限制

- 在UPdatePrice方法中增加销售宠物数量检查
- 当is_sale为1时检查
2026-03-12 19:33:56 +08:00
xinian
7720138290 fix: 修复宠物购买查询用户ID错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-12 11:11:46 +08:00
昔念
4c71aa9db1 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复宠物等级查询接口返回值初始化问题

- 在PetBagController.Level方法中初始化BaseRes返回值
- 修正PetService.Pet_LEVEL_all查询语句,移除不必要的Fields()调用
- 优化数据库查询条件,确保正确获取等级大于100的宠物数据
```
2026-03-12 01:07:05 +08:00
昔念
f091748542 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 优化战斗效果触发机制

- 移除 EffectDefeatTrigger 的 OnSkill 方法,简化标记逻辑
- 修复 SwitchOut 方法中的判断条件,正确检查对方精灵血量
- 移除多余的 can 字段检查,简化代码流程

feat(pet): 完善宠物购买事务处理

- 添加数据库事务支持,确保购买操作的原子性
- 增加余额检查的安全验证
- 使用原生SQL更新最大时间戳,避免
2026-03-11 22:51:52 +08:00
昔念
bef7c994ba ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(base): 兑换金币功能增加免费金币处理

用户兑换金币时同时处理免费金币的转换逻辑,
调用DuihuanFreeGold方法进行免费金币兑换

fix(player): 任务查询条件从task_id 500改为600

修改CanShop方法中的任务ID查询条件,
将硬编码的任务ID从500更正为600以匹配业务需求
```
2026-03-11 12:50:33 +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