Commit Graph

140 Commits

Author SHA1 Message Date
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk 0059b6d0c5 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-13 18:49:19 +08:00
sk edd992aecd 兑换商城自提,优化道具使用日志 2024-05-13 18:48:44 +08:00
kxdd e95d55ed10 Merge branch 'dev_timeitem_n1' into develop
# Conflicts:
#	model/player.go
2024-05-13 16:07:25 +08:00
kxdd c4161a6b39 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 15:18:13 +08:00
kxdd 075900766d Merge branch 'dev_newTimeitem' into dev_timeitem_n1 2024-05-13 11:39:21 +08:00
kxdd 052cfc1fe1 Merge branch 'dev_newTimeitem' into develop 2024-05-13 11:02:40 +08:00
kxdd a017518652 记牌器时间计算bug 2024-05-13 11:01:02 +08:00
kxdd 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +08:00
sk f2d9d51dd6 好友申请列表 2024-05-11 15:17:02 +08:00
by 4553558144 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-10 15:13:31 +08:00
by 8c432f6f4e 好友申请记录 2024-05-10 15:13:25 +08:00
sk 22dbae7f80 被邀请人充值任务 2024-05-10 11:44:58 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +08:00
kxdd bbf2e11d8b 记牌器调整添加
--story=1000618 --user=李海亮 记牌器调整 https://www.tapd.cn/31044302/s/1010552
2024-05-06 16:18:11 +08:00
kxdd 7756f3ae19 还原本来的道具功能
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
2024-05-06 13:44:49 +08:00
kxdd c2d7c1bfb5 存钱罐功能 2024-04-30 09:45:40 +08:00
lihailiang 03a67c3778 Merge branch 'dev_timeitem' into develop
# Conflicts:
#	common/constant.go
#	data/DB_GameItem.dat
#	protocol/server/pbdata.pb.go
#	protocol/server/server.pb.go
#	tools/xlsx2binary/agc.go
#	xlsx/DB_GameItem.xlsx
2024-04-28 18:23:13 +08:00
kxdd a7ec02b38e 1.记牌器道具时限修改
2.存钱罐数据创建
2024-04-28 17:36:08 +08:00
by 948c209a2c 周卡礼包 2024-05-06 00:00:35 +08:00
by 0595d999f4 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-26 14:58:36 +08:00
by 06d5ac5fad 周卡礼包需求修改 2024-04-26 14:58:31 +08:00
by 7fb33896de 周卡礼包需求修改 2024-04-26 14:57:26 +08:00
sk c40b779c39 成就任务 2024-04-26 13:40:47 +08:00
sk 7c11fc955b Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 11:42:03 +08:00
sk a6e65f236f 成就任务 2024-04-26 11:18:56 +08:00
by feeb04a7ed 周卡礼包 2024-04-26 10:21:36 +08:00
lihailiang 1efb19dce6 添加时效类道具功能 2024-04-25 17:41:53 +08:00
sk 2e0e6c72d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-25 16:44:11 +08:00
sk 77fbd7dfba 拉霸数据统计 2024-04-25 16:41:53 +08:00
by f54082163b 周卡礼包 2024-04-25 11:45:32 +08:00
by d8e03cf53d 删除周卡测试代码 2024-04-25 11:40:17 +08:00
by cc56a160af 周卡礼包 2024-04-25 11:39:24 +08:00
by 9f4d1089cb Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-23 10:29:21 +08:00
by 91ec9259bb 玩家等级排行榜 2024-04-23 09:58:57 +08:00
sk 9a9c62c1da etcd优化 2024-04-20 10:20:22 +08:00
sk 4fb1ec47b9 集卡活动 2024-04-18 15:01:43 +08:00
sk 4702c2d8bb 过滤rabbitmq机器人消息 2024-04-17 09:15:07 +08:00
sk f67df3c8df 集卡活动 2024-04-16 14:07:42 +08:00
sk 9405ae091e init 2024-04-12 10:35:47 +08:00