Commit Graph

128 Commits

Author SHA1 Message Date
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
昔念
bd09013d85 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 修复技能效果ID配置错误

- 修复NewSeIdx_66.go中空指针检查,避免程序崩溃
- 修正effect/407.go中技能ID从138改为407
- 修正effect/440.go中技能ID从138改为440,并修复类型引用错误
- 修正effect/523.go中属性设置对象错误,从Ctx().Opp改为Ctx().Our
- 修正effect_517.go中技能ID从452改为517
```
2026-03-11 23:38:51 +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
昔念
46bc05ab29 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 添加精灵可用性检查

新增Free字段验证,确保购买时精灵确实存在
```
2026-03-11 01:48:46 +08:00
昔念
baa75334ea ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 修改宠物价格字段类型为uint32

统一宠物价格相关字段的数据类型,将sale_price从float32改为uint32,
以保持数据类型一致性并避免浮点数精度问题。

- 更新controller中PriseReq结构体的Price字段类型
- 修改model中Pet结构体的SalePrice字段类型
- 调整service中UPdatePrice方法的参数类型
```
2026-03-11 01:32:49 +08:00
昔念
6430de9c5d ```
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
feat(pet): 添加宠物是否可售状态字段

新增is_sale字段用于控制宠物是否可售,
同时修改价格更新接口以支持设置销售状态
```
2026-03-11 01:30:31 +08:00
昔念
b0130f39d5 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(user): 添加申请商店功能

- 新增ReqShop接口用于用户申请成为商店角色
- 验证用户是否满足申请条件(任务完成状态)
- 将符合条件的用户分配到商店角色ID 27

feat(pet): 设置宠物价格最小值限制

- 为宠物价格设置最低5的限制
- 防止价格过低影响游戏平衡

feat(task): 实现商店申请条件检查

- 添加CanShop方法检查用户是否完成特定任务
- 使用位集验证任务ID 500
2026-03-11 00:43:17 +08:00
昔念
ed8b1b71c1 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 完善宠物购买功能的错误处理和数据验证

- 在控制器层添加错误返回值处理,确保购买宠物操作的错误能够正确传递
- 添加时间验证逻辑,防止使用过期或异常的数据进行购买操作
- 修正金币更新逻辑,确保玩家和系统金币扣除与增加的准确性
- 优化代码结构,增强代码可读性和维护性
```
2026-03-10 23:24:33 +08:00
昔念
fc620d668f ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(player): 宠物购买功能优化

- 使用PetInfo_One_ID方法替代直接数据库查询
- 调整宠物购买时的价格计算逻辑,买入价格从*100调整为*102
- 卖出价格从*100调整为*98,买入扣款也相应调整为*102
- 删除宠物时使用Pet_del方法替代直接数据库删除操作
- 新增PetInfo_One_ID方法
2026-03-10 23:05:43 +08:00
昔念
6792e0e79a ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(pet): 添加宠物交易功能

- 新增ModPrise接口用于修改宠物售价
- 新增BuyPet接口用于购买宠物
- 修改Pet模型中SalePrice字段类型为float32
- 实现宠物购买逻辑,包括价格验证、余额检查和交易处理
- 更新查询条件以支持宠物交易状态筛选
```
2026-03-10 22:20:36 +08:00
昔念
69350bb79e ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(fight): 修复战斗效果类型初始化错误

- 将EffectType.NewSel更改为EffectType.Skill以修正技能效果类型
- 移除effect_415中的多余变量声明,直接使用参数值进行治疗计算

feat(admin): 添加用户金币增加功能

- 新增UserGoldAddReq结构体用于处理金币添加请求
- 实现GoldAdd方法支持管理员为指定用户增加金币

feat(pet):
2026-03-10 20:51:48 +08:00
昔念
1fa1ae848d ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 实现技能PP消耗Hook机制并优化效果处理

- 在Effect475中添加子效果时通过Ctx().Our.AddEffect正确添加效果
- 删除已废弃的Effect407、Effect440和Effect412效果类型
- 在fightc.go中实现技能使用后的PP消耗Hook机制,支持效果修改PP消耗数量
- 添加HookPP接口方法用于处理技能使用的PP消耗逻辑
- 在SkillInfo中添加Use方法用于实际消耗PP值
```
2026-03-09 23:44:09 +08:00
xinian
f6570c7e40 refactor: 提取效果493和497到独立文件
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-08 16:04:41 +08:00
xinian
73d7f7f062 feat: 新增战斗效果和修复登录逻辑
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-08 11:22:00 +08:00
xinian
2d4ec0e5ba refactor: 重构战斗回合结束逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 18:50:51 +08:00
xinian
bf2325e2ef feat: 添加技能效果及宠物性别注释
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 15:15:15 +08:00
xinian
02629b6f6c feat: 新增多个技能效果实现
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-07 13:54:42 +08:00
xinian
bbaa71f4b2 refactor: 重构宠物初始化逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
提取宠物配置初始化到ConfigBoss方法,简化initplayer代码
2026-03-07 11:30:17 +08:00
昔念
4bb7477147 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(fight): 添加战斗攻击值获取接口并实现战斗规则系统

添加 GetAttackValue 方法到 FightI 接口,用于获取战斗中的攻击值信息。

新增 RuleI 接口定义战斗规则契约,包括 SetArgs 和 Exec 方法。

重构战斗规则系统:
- 创建 RuleBase 基类提供通用参数存储和基础方法
- 实现 17
2026-03-07 00:26:05 +08:00
昔念
24e7f2cd17 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
fix(player): 修复周重置时间字段名不一致问题

- 修正了Player模型中WeekLastResetTime字段的JSON标签,
  从"last_week_reset_time"改为"week_last_reset_time"
- 更新了数据库更新操作中的字段名以保持一致性
- 调整了登录控制器中的调试循环参数,任务ID范围从3
2026-03-05 23:51:07 +08:00
xinian
a4b09a77c3 fix: 修复玩家登录时间重置逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 21:22:18 +08:00
xinian
03d93a2fba fix: 修正伤害类型和任务状态判断逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 17:40:42 +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
xinian
2259093790 feat: 支持每周任务重置和查询
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 14:56:28 +08:00
xinian
b1ca686e06 refactor: 重构 PVP 匹配逻辑使用模型结构体
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-05 11:21:38 +08:00
昔念
aa53001982 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(cool): 移除Redis监听功能和用户结构体定义

移除ListenFunc函数,该函数提供Redis PubSub监听功能,
包括自动重连和心跳保活机制。同时删除User结构体定义和
相关有序集合变量,这些功能将由rpc模块替代实现。

feat(rpc): 添加对ListenFunc的调用以处理Redis监听

在login模块中
2026-03-04 23:38:21 +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
昔念
5874ae270f ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(item-use): 完善玄彩道具使用逻辑并添加宠物闪亮状态修复功能

- 在玄彩道具使用过程中添加闪亮状态修复检查,确保道具使用前宠物状态正常
- 修改FixShiny方法返回布尔值以指示操作是否成功
- 当物品不足时返回ErrItemUnusable错误码
- 调整代码执行顺序,先进行闪亮状态修复再更新物品数量
```
2026-03-04 14:12:48 +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
昔念
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
昔念
dab4862f28 Merge branch 'main' of https://cnb.cool/blzing/blazing
Some checks failed
ci/woodpecker/push/my-first-workflow Pipeline failed
2026-03-02 21:56:34 +08:00
昔念
ae534a2e1e ```
feat(item_buy): 优化商品购买限额检查逻辑

- 修改购买黄金商品时的限额验证方式,直接检查单次购买数量是否超过限制
- 调整GoldLog.Cheak方法参数顺序,增加总量控制参数
- 更新错误返回条件,提高限额检查准确性

fix(player_service): 添加时间范围检查功能

- 引入utils工具包用于时间范围验证
- 在IsMatch方法中添加活动开始时间和结束时间的范围检查
- 如果当前时间不在活动时间内则返回匹配失败

refactor(gold_log):
2026-03-02 01:36:16 +08:00
xinian
74ede45d92 fix: 添加宠物进化等级检查并修复降级逻辑
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-03-01 11:25:30 +08:00
昔念
01c8c04df6 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
refactor(fight): 移除未使用的xmlres导入并优化回血逻辑

移除input包中未使用的xmlres导入,将宠物血量处理逻辑
封装到PetInfo模型中,并添加ModelHP方法来统一处理血量增减
逻辑。

feat(dict): 注释初始化数据相关代码

注释掉字典模块
2026-03-01 00:02:41 +08:00
xinian
f8b948721f refactor: 简化玩家称号获取逻辑,直接返回ID列表
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-27 10:21:49 +08:00
昔念
741b938587 1
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
2026-02-27 01:00:01 +08:00
昔念
a210d653d2 ```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
feat(shop): 添加商品限购功能并优化购买逻辑

- 修改购买黄金商品接口,添加商品配额检查功能
- 新增月、周、日三种限购类型检查逻辑
- 当商品超出库存或达到购买限制时返回相应错误码
- 移除gold_log表中PlayerID字段的唯一索引约束
- 修复GoldService中的Cheak方法实现,支持多种时间维度限购检查
```
2026-02-27 00:09:23 +08:00