Commit Graph

1635 Commits

Author SHA1 Message Date
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 9474b0dc30 修改游戏掉落物品配置规则 2024-05-10 14:47:38 +08:00
sk 061ee27ab7 update DB_GameItem.xlsx 2024-05-10 13:55:20 +08:00
sk 22dbae7f80 被邀请人充值任务 2024-05-10 11:44:58 +08:00
sk a943492d80 开启兑换渠道控制 2024-05-10 09:17:58 +08:00
sk 7dcd78d3ef 邀请分享链接简化
公告增加渠道参数
2024-05-09 17:18:16 +08:00
sk 5b758cdb80 update 2024-05-09 10:41:17 +08:00
sk 672881b9d2 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-08 18:49:23 +08:00
sk 6bd9d8f6c5 重置水池 2024-05-08 18:49:00 +08:00
sk c09c059b79 重置水池 2024-05-08 18:48:27 +08:00
sk 7219ddaed8 重置水池 2024-05-08 18:34:02 +08:00
sk 05f1e805b5 重置水池 2024-05-08 18:33:33 +08:00
sk 4753b4a71a 在线统计接口 2024-05-08 18:17:35 +08:00
by 666cbf64eb 等级榜修改 2024-05-08 18:07:07 +08:00
by 5eeec8469f 等级榜删除无用代码 2024-05-08 17:38:34 +08:00
by b000a8b05d 玩家等级榜log输出error修改 2024-05-08 17:36:14 +08:00
sk 64a1df39c5 代码优化 2024-05-08 16:36:07 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +08:00
sk 1c80a73741 Merge branch 'develop' into release 2024-05-07 18:09:20 +08:00
sk c1a15c59c3 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-07 18:09:07 +08:00
sk f3b757d0bc 比赛场优化 2024-05-07 18:09:01 +08:00
kxdd 2904be27f4 Merge branch 'dev_pigbank' into develop 2024-05-07 17:49:10 +08:00
kxdd 464f112038 存钱罐优化最大值 2024-05-07 17:48:35 +08:00
sk 48456483c7 tienlen牌库随机索引错误 2024-05-07 16:19:03 +08:00
sk e6240f1796 Merge branch 'develop' into release 2024-05-07 16:04:08 +08:00
kxdd 54eed8a7fc Merge branch 'dev_pigbank' into develop 2024-05-07 16:03:25 +08:00
kxdd 28bfd15336 存钱罐数据修改 2024-05-07 16:02:58 +08:00
sk 71b5e2599d Merge branch 'release' into 0507 2024-05-07 13:46:54 +08:00
sk cb1a157813 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-07 13:42:27 +08:00
kxdd 04cf926909 Merge branch 'dev_pigbank' into develop 2024-05-07 13:43:15 +08:00
kxdd 7b79b0defd 存钱罐 tienlen场景判断修改 2024-05-07 13:41:24 +08:00
sk 6aed244c8c update data
还原
DB_Createroom.xlsx
DB_Game_Drop.xlsx
2024-05-07 09:53:38 +08:00
kxdd ad4a424024 Merge branch 'dev_newTimeitem' into develop
# Conflicts:
#	gamesrv/tienlen/playerdata_tienlen.go
2024-05-06 18:34:37 +08:00
sk 6ffe1d5375 更新v卡掉落表 2024-05-06 17:55:32 +08:00
kxdd e6b3084bc5 Merge branch 'dev_pigbank' into develop 2024-05-06 17:15:37 +08:00
kxdd 161d215ffd --bug=1000247 --user=李海亮 存钱罐购买后相关问题 https://www.tapd.cn/31044302/s/1010551 2024-05-06 17:14:59 +08:00
kxdd 7113465765 记牌器优化 2024-05-06 16:37:09 +08:00
kxdd bbf2e11d8b 记牌器调整添加
--story=1000618 --user=李海亮 记牌器调整 https://www.tapd.cn/31044302/s/1010552
2024-05-06 16:18:11 +08:00
sk 1430e96752 update data 2024-05-06 16:09:25 +08:00
sk 9338164838 兼容以0开头的手机号登录 2024-05-06 15:45:06 +08:00
kxdd 7756f3ae19 还原本来的道具功能
--task=1000620 --user=李海亮 记牌器调整多道具修改逻辑 https://www.tapd.cn/31044302/s/1010514
2024-05-06 13:44:49 +08:00
sk 23b44237d8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-06 11:32:29 +08:00
sk d6cb1f3266 兼容以0开头的手机号登录 2024-05-06 11:19:41 +08:00
sk 404017c33e no message 2024-05-06 11:19:41 +08:00
kxdd 83f571b543 Merge branch 'dev_pigbank' into develop 2024-05-06 10:31:22 +08:00
kxdd 84373d1297 【对局失败后存钱罐内没有存钱】https://www.tapd.cn/31044302/bugtrace/bugs/view?bug_id=1131044302001000241 2024-05-06 10:30:45 +08:00
kxdd 016ea68379 Merge branch 'dev_pigbank' into develop 2024-04-30 18:45:34 +08:00
kxdd 7c689dc6ec 存钱罐修改 2024-04-30 18:44:51 +08:00
sk 1979637197 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-30 17:45:51 +08:00