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

214 Commits

Author SHA1 Message Date
sk 7b05295d67 获奖记录 2024-07-30 17:58:56 +08:00
by a5cd7beeeb 获奖记录 2024-07-30 15:47:35 +08:00
by 7d5085bf11 获奖记录 2024-07-30 15:16:44 +08:00
by fa3e48cd26 获奖记录 2024-07-30 14:40:06 +08:00
by a2501eefa4 排行榜代码（已屏蔽） + 获奖记录 2024-07-27 10:48:04 +08:00
sk fff05f7470 渠道活动开关 2024-07-25 16:01:09 +08:00
sk 9f6e9aa910 解决冲突 2024-07-25 14:49:25 +08:00
sk 550e5eb690 fix:模型初始化 2024-07-25 14:46:47 +08:00
by 60709a140f Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 
# Conflicts:
#	protocol/webapi/common.proto
 2024-07-25 14:39:03 +08:00
sk 5eaa1e2016 皮肤技能加成 2024-07-25 09:57:31 +08:00
sk 6a3dae36e1 皮肤2期 2024-07-24 16:19:08 +08:00
sk a293b03b21 添加推广渠道 2024-07-22 14:49:10 +08:00
sk 8e880d65b1 道具兑换撤单 2024-07-19 10:21:12 +08:00
sk f637724a61 道具兑换撤单 2024-07-19 09:30:19 +08:00
sk 64577b5f2a 记录注册ip 2024-07-13 14:56:09 +08:00
sk 9ec909dd58 皮肤功能 2024-07-12 17:11:25 +08:00
sk 1123fe94ab 赛季挑战任务 2024-07-11 17:23:56 +08:00
sk 06343ab6fc 通行证活动统计数据 2024-07-11 11:56:34 +08:00
sk b3d95e3512 玩家信息添加v卡消耗和充值金额 2024-07-10 15:53:06 +08:00
sk f2c63ce427 v卡掉落 2024-07-10 11:18:49 +08:00
by c671da56e6 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 
# Conflicts:
#	etcd/keyconf.go
#	model/config.go
#	protocol/player/player.pb.go
#	protocol/player/player.proto
#	protocol/webapi/common.pb.go
#	protocol/webapi/common.proto
#	worldsrv/etcd.go
 2024-07-09 17:43:14 +08:00
by 0484f1f47b 钻石抽奖实现 2024-07-09 17:35:55 +08:00
sk d29c485c87 记录注册ip和登录id 2024-07-09 15:49:51 +08:00
sk 7a0500c5eb 道具记录增加消耗道具数量 2024-07-09 15:20:44 +08:00
sk e9b80f805e 增加赠送奖励记录 2024-07-09 11:35:15 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
sk aabf20da2c 赛季通行证兑换开关 2024-07-06 01:22:36 +08:00
sk cc656a5bbc 赛季通行证重置 2024-07-04 14:51:57 +08:00
sk f25adaf3e9 赛季通行证兑换记录 2024-07-04 10:07:23 +08:00
by 1c14d96060 Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop 
# Conflicts:
#	protocol/webapi/common.pb.go
 2024-07-03 19:12:22 +08:00
by 007b0c3a5b 比赛场库存 2024-07-03 19:11:49 +08:00
sk 87a9186ae3 赛季通行证数据记录 2024-07-03 17:26:12 +08:00
sk e2d18f491b 赛季通行证排行榜 2024-07-03 15:25:33 +08:00
sk 8117f1af54 赛季通行证数据记录 2024-07-03 10:08:04 +08:00
sk 2e34c33768 赛季通行证账变记录 2024-07-02 20:51:10 +08:00
sk aaf15d2b3d 龙币变化通知 2024-07-02 18:34:25 +08:00
sk 78d6a109fe 赛季通行证 2024-07-02 17:34:44 +08:00
sk c75df5742e 赛季通行证活动 2024-07-02 14:30:49 +08:00
sk 4c7abf167e 赛季通行证 2024-07-02 14:21:24 +08:00
by b6aaf756e6 宠物技能 2024-07-01 11:47:42 +08:00
sk 2805e4ca6c 通行证协议 2024-06-29 15:29:01 +08:00
sk 303f0817ca mongodb事务 2024-06-28 15:07:57 +08:00
sk bdbf908e36 任务系统赠送金币记录 2024-06-27 17:53:53 +08:00
sk bc3be9673d 新版邀请活动 2024-06-27 10:55:11 +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 7ae4392784 新版邀请活动 2024-06-26 11:04:51 +08:00
sk 8eb9a7c7a1 新版邀请活动 2024-06-25 18:06:32 +08:00
by 7e05717d2e 同步表 2024-06-25 17:48:10 +08:00
by da249ec436 同步表+钻石存储罐功能实现+七日签到进阶奖励修改 2024-06-25 17:31:41 +08:00
by 6985bc0437 累计签到进阶奖励实现 2024-06-24 09:29:56 +08:00
sk 9d246dcba3 排位赛赛季信息添加待领取奖励信息 2024-06-18 15:34:26 +08:00
sk 2a7ada450a 增加钻石消耗记录类型 2024-06-14 18:35:52 +08:00
sk 3526ef069f 解散空闲房间 
房间没有真人或观众，并且长时间没有真人进出房间就解散
 2024-06-12 14:39:27 +08:00
sk c72b74824e 修改邀请绑定数量 2024-06-11 09:13:31 +08:00
sk 41361621ef 比赛日志用开始比赛时备份的配置不能用最新配置 2024-06-11 09:13:31 +08:00
sk d7b72cd6ea 对战场统计数据版本 2024-06-06 16:21:54 +08:00
sk 869a2c91d2 邀请积分排行榜 2024-06-06 16:09:14 +08:00
sk aee5f99d9d 重置个人水池调控数据 2024-06-06 14:22:18 +08:00
sk 3c3b6f7376 修复跨天检测错误 2024-06-04 15:39:38 +08:00
sk 5e0b6139f9 tienlen记录调控信息 2024-06-03 16:54:54 +08:00
sk 39b71ea93f 比赛时间 2024-06-03 14:23:46 +08:00
sk 35c0e07004 发送邮件添加渠道筛选 2024-06-03 14:23:46 +08:00
sk 481860d9bc 修改注释 2024-05-25 15:03:17 +08:00
sk 63efa84183 update 2024-05-24 16:46:41 +08:00
sk bc77fe8749 保存玩家最后一次包渠道 2024-05-24 10:17:09 +08:00
sk c86e28383d 比赛场代码优化 2024-05-21 15:08:16 +08:00
sk 0739d1eb12 优化游戏类型判断 2024-05-17 09:16:49 +08:00
sk 6dfe2301e0 修改游戏入口开关 2024-05-16 15:06:16 +08:00
sk d534e73613 道具日志 2024-05-14 10:26:40 +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 437ec223f7 --story=1000624 --user=李海亮 记牌器优化二版 https://www.tapd.cn/31044302/s/1011235 2024-05-13 10:52:53 +08:00
by 355c6aae93 比赛场数据统计 2024-05-11 17:10:30 +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 0d81105909 添加配置参数 
CloseChannelSwitch 关闭渠道开关功能
 2024-05-10 17:10:45 +08:00
sk f45708a8cc 道具掉落添加渠道开关 2024-05-10 16:38:10 +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
by 5eeec8469f 等级榜删除无用代码 2024-05-08 17:38:34 +08:00
by b000a8b05d 玩家等级榜log输出error修改 2024-05-08 17:36:14 +08:00
sk a822e21524 代码优化 2024-05-08 14:10:27 +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 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
sk 404017c33e no message 2024-05-06 11:19:41 +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
sk 2e6928f317 添加渠道信息 2024-04-28 11:45:43 +08:00
sk 2fe90f46a5 游戏牌局统计 2024-04-26 14:51:37 +08:00
sk fe0904c4fb 破产消息添加渠道 2024-04-26 13:51: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
sk ec635783c4 evt_online添加渠道信息 2024-04-25 13:34:23 +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 0cba0b0b25 Merge branch 'develop' into tongji 2024-04-24 17:22:25 +08:00
sk 3a5039727b 优化账号表 2024-04-23 15:10:48 +08:00
WIN-20240218AEU\Administrator ebd1653b86 log修改 2024-04-23 15:08:43 +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 4fb1ec47b9 集卡活动 2024-04-18 15:01:43 +08:00
sk e500cc3f13 控制开启所有活动 2024-04-16 18:16:14 +08:00
sk 9405ae091e init 2024-04-12 10:35:47 +08:00