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
by c2a7fa3834 修改钻石存储罐计算保留后4位小数 2024-06-27 10:49:51 +08:00
by c845dcad4e 配置表修改 2024-06-26 17:28:24 +08:00
by 20ebed0347 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-26 16:59:00 +08:00
by 3a60afc0d0 金币存钱罐修改 2024-06-26 16:58:50 +08:00
sk 1edaac6773 Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-26 16:55:07 +08:00
sk 523ed5b296 新版邀请活动离线积分计算 2024-06-26 16:50:47 +08:00
by 09aa018fec 钻石存钱罐 +获取运营商数据 2024-06-26 16:46:17 +08:00
sk e0f2f76322 新版邀请活动 2024-06-26 14:30:06 +08:00
sk 754f94abbd 添加日志 2024-06-26 11:50:55 +08:00
sk 96599507b8 添加日志 2024-06-26 11:46:16 +08:00
by ac76712485 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 2024-06-26 11:21:59 +08:00
by fdd5e3889e 背包使用兑换功能实现 2024-06-26 11:21:54 +08:00
sk 0c846595eb 解决冲突 2024-06-26 11:14:00 +08:00
sk 7ae4392784 新版邀请活动 2024-06-26 11:04:51 +08:00
by 9ed4f708bc 备注信息修改 2024-06-26 09:38:59 +08:00
by 9ef37b0bce 备注信息修改 2024-06-26 09:29:12 +08:00
by 7d98b14f5b 钻石存钱罐更新 2024-06-25 18:42:42 +08:00
sk 8eb9a7c7a1 新版邀请活动 2024-06-25 18:06:32 +08:00
by f24d6c740b 删除测试代码 2024-06-25 17:52:12 +08:00
by 7e05717d2e 同步表 2024-06-25 17:48:10 +08:00
by da249ec436 同步表+钻石存储罐功能实现+七日签到进阶奖励修改 2024-06-25 17:31:41 +08:00
by 11d78d2386 累计签到进阶奖励修改增加google渠道区分 2024-06-30 18:10:52 +08:00
by c61c88266b 累计签到进阶奖励修改 2024-06-25 10:48:36 +08:00
by a6d76b3f94 累计签到进阶奖励更新 2024-06-24 09:42:37 +08:00
by 6985bc0437 累计签到进阶奖励实现 2024-06-24 09:29:56 +08:00
sk 56fb4612c7 比赛场开赛时间判断 2024-06-19 21:02:00 +08:00
sk 992ccb280e 比赛场开赛时间判断 2024-06-19 21:01:17 +08:00
sk 4f6222cdc5 比赛场开赛时间判断 2024-06-19 20:15:31 +08:00
sk 573a59045b Merge branch 'develop' into release 2024-06-19 19:43:35 +08:00
sk 168c2cc8c3 比赛场开赛时间判断 2024-06-19 19:04:51 +08:00
sk 2520ec2e7d 解决冲突 2024-06-19 15:26:25 +08:00
sk 9d246dcba3 排位赛赛季信息添加待领取奖励信息 2024-06-18 15:34:26 +08:00
sk a2584b22bc 钻石消耗记录 2024-06-15 18:24:39 +08:00
sk 2a7ada450a 增加钻石消耗记录类型 2024-06-14 18:35:52 +08:00
by 5e212ae658 周卡续费BUG修改 2024-06-14 13:29:58 +08:00
by d57909b05a 删除无用代码 2024-06-14 11:41:18 +08:00
sk b24d97fe59 解散空闲房间 2024-06-14 11:40:51 +08:00
sk f1dee4a54a Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-06-14 09:31:37 +08:00
by feda7fd5c1 删除无用代码 2024-06-24 17:11:56 +08:00
sk c429d41900 比赛添加比赛区分 2024-06-13 13:55:00 +08:00
by a8500da1a7 周卡续费BUG修改 2024-06-12 16:44:59 +08:00
sk 3526ef069f 解散空闲房间 
房间没有真人或观众，并且长时间没有真人进出房间就解散
 2024-06-12 14:39:27 +08:00
sk ceac412a25 比赛类型列表 2024-06-11 11:23:43 +08:00
sk 41361621ef 比赛日志用开始比赛时备份的配置不能用最新配置 2024-06-11 09:13:31 +08:00
sk 869a2c91d2 邀请积分排行榜 2024-06-06 16:09:14 +08:00
sk 604f7099ec 修改HOOK_AFTER_STOP 2024-06-06 16:04:03 +08:00
sk aee5f99d9d 重置个人水池调控数据 2024-06-06 14:22:18 +08:00
sk 776ba8a19c 进入好友房 2024-06-03 18:36:06 +08:00
sk 39b71ea93f 比赛时间 2024-06-03 14:23:46 +08:00
sk 35c0e07004 发送邮件添加渠道筛选 2024-06-03 14:23:46 +08:00
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