tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
513 Commits 9 Branches 0 Tags 86 MiB
Commit Graph

288 Commits

Author SHA1 Message Date
sk e1812b5ecf vip添加比赛场免费次数 2024-05-31 09:58:00 +08:00
sk ef59d75ac5 vip添加比赛场免费次数 2024-05-30 17:33:31 +08:00
sk 9177d20d5e 修复空指针异常 2024-05-29 09:17:14 +08:00
sk b9c1b85193 玩家信息接口道具列表 2024-05-28 14:51:21 +08:00
sk bfbe02be66 道具变化添加后台操作类型 2024-05-28 14:49:20 +08:00
sk 60255489d5 预创建房间 2024-05-28 09:58:18 +08:00
sk 8b478a9f33 解决冲突 2024-05-28 09:26:18 +08:00
sk 516ab3f811 修复预创建房间问题 2024-05-28 09:24:14 +08:00
sk 29745d23c2 渠道开关 2024-05-25 18:24:21 +08:00
sk d529ec2fed update 2024-05-25 17:56:03 +08:00
sk da5bb97469 review 2024-05-25 15:45:59 +08:00
sk 0d252cebc5 添加道具类型 2024-05-25 14:47:23 +08:00
sk 63efa84183 update 2024-05-24 16:46:41 +08:00
sk a0050bd44d 离线加币问题 2024-05-24 15:23:29 +08:00
sk d27c0270f8 no message 2024-05-24 12:00:32 +08:00
sk eddad2e788 解决冲突 2024-05-24 10:48:22 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk 27dfedab18 etcd 2024-05-24 09:37:34 +08:00
sk c8be1b9320 etcd,rabbitmq防止在init方法隐式调用 2024-05-22 17:57:42 +08:00
sk 489395ebb1 删除比赛场段位 2024-05-22 17:57:42 +08:00
sk c86e28383d 比赛场代码优化 2024-05-21 15:08:16 +08:00
by 4254d08e38 兑换增加错误码返回 2024-05-20 14:50:11 +08:00
by e9c29f1442 背包修改 2024-05-20 10:36:48 +08:00
by 64bcbb896e 添加道具接口增加扣除道具检测 2024-05-20 10:09:48 +08:00
sk 8bdd4f09dc 绑定人数统计问题 2024-05-17 14:16:56 +08:00
sk fa34c9c8b2 绑定邀请人任务 2024-05-17 11:31:27 +08:00
sk 11af348377 比赛配置添加手机卡类型 2024-05-17 09:30:03 +08:00
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk 3828311520 邀请分享链接 2024-05-16 15:22:26 +08:00
sk d298ed97e8 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-16 15:06:25 +08:00
sk 6dfe2301e0 修改游戏入口开关 2024-05-16 15:06:16 +08:00
by f1308bbb09 后台增加添加道具接口 2024-05-16 13:54:52 +08:00
by 5eb29259c1 后台增加添加道具接口 2024-05-16 11:59:52 +08:00
by 2ecbc2b1cb 后台增加添加道具接口 2024-05-16 09:59:18 +08:00
by 478ab9ea0a 兑换自提 添加道具走后台 2024-05-15 18:04:39 +08:00
by e58eb4d672 兑换创建订单增加telcharge字段 2024-05-15 10:12:41 +08:00
by b0ba8e31ff 商城兑换修改 2024-05-14 17:49:18 +08:00
by 756ed06016 比赛log保存数据库修改 2024-05-14 11:44:31 +08:00
by 06695defa6 比赛log保存数据库修改 2024-05-14 11:38:44 +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
by 384f8b5b9c 删除打印log 2024-05-11 17:59:23 +08:00
by 355c6aae93 比赛场数据统计 2024-05-11 17:10:30 +08:00
sk 5ac5c633a2 no message 2024-05-11 17:06:49 +08:00
sk 7c02471d2c Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-05-11 16:54:25 +08:00
sk f2d9d51dd6 好友申请列表 2024-05-11 15:17:02 +08:00
kxdd 579e27e17f --story=1000625 --user=李海亮 存钱罐购买限制补充 https://www.tapd.cn/31044302/s/1011001 2024-05-11 11:59:22 +08:00
sk ff78edf56b update 2024-05-11 11:02:24 +08:00
sk 267c0492f6 解决冲突 2024-05-10 16:53:42 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +08:00
by 62bacfb0d2 兑换商城 自提功能实现 2024-05-10 16:24:09 +08:00
by 16a41fff24 兑换商城 自提功能实现 2024-05-10 16:01:39 +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 a943492d80 开启兑换渠道控制 2024-05-10 09:17:58 +08:00
sk 7dcd78d3ef 邀请分享链接简化 
公告增加渠道参数
 2024-05-09 17:18:16 +08:00
sk 4753b4a71a 在线统计接口 2024-05-08 18:17:35 +08:00
sk 64a1df39c5 代码优化 2024-05-08 16:36:07 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +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
kxdd ad4a424024 Merge branch 'dev_newTimeitem' into develop 
# Conflicts:
#	gamesrv/tienlen/playerdata_tienlen.go
 2024-05-06 18:34:37 +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 bbf2e11d8b 记牌器调整添加 
--story=1000618 --user=李海亮 记牌器调整 https://www.tapd.cn/31044302/s/1010552
 2024-05-06 16:18:11 +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 d6cb1f3266 兼容以0开头的手机号登录 2024-05-06 11:19:41 +08:00
sk 404017c33e no message 2024-05-06 11:19:41 +08:00
kxdd eaf8dd734f Merge branch 'dev_pigbank' into develop 2024-04-30 17:33:39 +08:00
kxdd 72b5f14b62 存钱罐修改 2024-04-30 17:32:57 +08:00
kxdd 909523ec3e Merge branch 'dev_pigbank' into develop 
# Conflicts:
#	common/constant.go
#	data/DB_Pigbank_Prop.dat
#	data/DB_Pigbank_Prop.json
#	gamesrv/tienlen/playerdata_tienlen.go
#	protocol/server/pbdata.pb.go
#	xlsx/DB_Pigbank_Prop.xls
存钱罐功能
 2024-04-30 14:22:18 +08:00
kxdd c2d7c1bfb5 存钱罐功能 2024-04-30 09:45:40 +08:00
sk bd92567666 解决冲突 2024-04-29 17:20:53 +08:00
sk c6c507ecb0 修复手机号登录问题 2024-04-29 16:47:05 +08:00
lihailiang f7ae511332 存钱罐数据添加 2024-04-29 11:33:53 +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
sk 0cc96a5747 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-28 16:47:49 +08:00
sk 3bfcaaf110 修复钻石账变记录 2024-04-28 16:47:41 +08:00
by cfa469a02e log修改 2024-04-28 15:51:13 +08:00
sk 0da4aa2f09 evt_online临时删除 2024-04-28 15:28:55 +08:00
sk 2e6928f317 添加渠道信息 2024-04-28 11:45:43 +08:00
kxdd ec0d303cb6 道具时限类道具修改 2024-04-26 17:46:21 +08:00
sk 05844ea78d update 2024-04-26 16:36:56 +08:00
sk 4ac9879f72 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 16:32:49 +08:00
by 42302a32a5 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-05-06 00:00:47 +08:00
by 948c209a2c 周卡礼包 2024-05-06 00:00:35 +08:00
sk 853e7771f9 登录返回服务器时间戳 2024-04-26 16:32:40 +08:00
sk ebad03fce1 创建订单添加渠道 2024-04-26 15:25:19 +08:00
sk 40822ad4d0 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-04-26 15:11:01 +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 2fe90f46a5 游戏牌局统计 2024-04-26 14:51:37 +08:00
sk fe0904c4fb 破产消息添加渠道 2024-04-26 13:51:36 +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
sk b6aa7bec3c 任务系统优化 2024-04-26 09:44:25 +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
sk ec635783c4 evt_online添加渠道信息 2024-04-25 13:34:23 +08:00
by f54082163b 周卡礼包 2024-04-25 11:45:32 +08:00
by d8e03cf53d 删除周卡测试代码 2024-04-25 11:40:17 +08:00
by aa79d36e9f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-04-25 11:39:29 +08:00
by cc56a160af 周卡礼包 2024-04-25 11:39:24 +08:00
sk aa3a713699 evt_online添加渠道信息 2024-04-25 09:46:57 +08:00
sk 82b406cbcd 水池添加调节赔率和新手池 2024-04-24 16:26:35 +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 0de01b7eaa 复仇者联盟 2024-04-22 18:39:27 +08:00
sk 9a9c62c1da etcd优化 2024-04-20 10:20:22 +08:00
sk 3d653d6413 道具使用优化 2024-04-19 14:55:10 +08:00
sk aadfc98306 no message 2024-04-19 09:57:48 +08:00
sk 4fb1ec47b9 集卡活动 2024-04-18 15:01:43 +08:00
sk 8418435068 fix:触发转盘签到事件 2024-04-17 17:59:35 +08:00
sk 8ac802e2a3 fix:道具数量同步错误 2024-04-17 17:49:34 +08:00
sk ad363f7d85 代码上传工具 
tools/upload
 2024-04-17 10:50:00 +08:00
sk c6799597c3 rename 2024-04-17 10:19:01 +08:00
sk 4702c2d8bb 过滤rabbitmq机器人消息 2024-04-17 09:15:07 +08:00
sk e500cc3f13 控制开启所有活动 2024-04-16 18:16:14 +08:00
sk 737fea1e23 活动代码优化 2024-04-16 17:44:56 +08:00
sk 9a8b5d25ef 集卡活动 2024-04-16 17:44:56 +08:00
sk f67df3c8df 集卡活动 2024-04-16 14:07:42 +08:00
sk 84dd2bdc79 init 2024-04-15 15:12:47 +08:00
sk 9405ae091e init 2024-04-12 10:35:47 +08:00