Commit Graph

246 Commits

Author SHA1 Message Date
sk fb02fa630e 十三张参数修改 2024-11-18 09:58:51 +08:00
sk d3f276f0bf 兑换优化 2024-11-14 11:13:47 +08:00
sk 0932715970 修改脚本 2024-11-08 11:28:13 +08:00
sk 195a8c4b70 脚本优化 2024-11-06 14:19:02 +08:00
sk 8b1ae79c9b no message 2024-10-23 10:57:50 +08:00
sk c8a39f2d1f 解决冲突 2024-10-23 10:56:07 +08:00
sk 52d3b46f6e 竞技馆抽奖活动 2024-10-23 10:53:40 +08:00
sk f47a9dcc9a no message 2024-10-22 16:07:46 +08:00
sk 7591d58829 修复拉霸入场限额 2024-10-18 10:27:22 +08:00
sk e5378e46f9 首冲加赠是否翻倍 2024-10-10 17:50:19 +08:00
sk 4c4af75a76 客户端升级奖励 2024-10-10 15:27:21 +08:00
sk c24d622bb9 update gameitem 2024-09-28 10:12:14 +08:00
sk 6f700f9ef6 no message 2024-09-28 10:03:29 +08:00
by fbacc4d57b 配置文件更新 2024-09-27 11:35:07 +08:00
sk 04a832a595 提交bin目录 2024-09-25 15:39:46 +08:00
by 67a5912db5 更新配置表 2024-09-20 13:44:37 +08:00
by d3642c93e4 娃娃兑换 2024-09-19 17:18:16 +08:00
sk 70d051d938 查询房间信息更新道具表 2024-09-19 09:21:12 +08:00
sk 02365888a1 update excel 2024-09-18 15:30:43 +08:00
sk 1cc5d4f226 添加水池配置 2024-09-07 09:19:51 +08:00
sk fc2db94c86 竞技馆列表刷新 2024-09-06 14:00:34 +08:00
sk a126fb81ae 修改排位赛奖励 2024-09-05 14:31:12 +08:00
sk bcac7f06d3 update public 2024-09-05 11:26:52 +08:00
kxdd 27eb944329 娃娃机配置更新 2024-09-04 10:49:16 +08:00
by 59535c2015 更新配置 2024-09-03 15:46:54 +08:00
by 981c3860d1 Merge remote-tracking branch 'origin/develop' into ma
# Conflicts:
#	data/DB_GameFree.dat
#	data/DB_PropExchange.dat
#	data/DB_Task.dat
#	etcd/keyconf.go
#	model/config.go
#	protocol/webapi/common.pb.go
#	protocol/webapi/common.proto
#	protocol/webapi/webapi.proto
#	public
#	xlsx/DB_GameFree.xlsx
2024-09-03 15:46:11 +08:00
kxdd fe26aa3d37 娃娃机获取视频流修改 2024-08-30 18:15:44 +08:00
sk 74efab000e 新增拉霸游戏 2024-08-30 17:19:03 +08:00
sk 94ca1562e5 解决冲突 2024-08-29 14:51:32 +08:00
sk 1db69f8df3 update excel 2024-08-27 14:51:30 +08:00
sk 613ed6da76 update excel 2024-08-27 11:05:42 +08:00
sk 904982158a 房卡场游戏 2024-08-26 16:54:07 +08:00
sk 1db62f9d90 gameconfig 2024-08-24 18:23:47 +08:00
sk 85ba5689b1 添加tienlen房卡场游戏配置 2024-08-22 16:17:51 +08:00
sk cd321a3f55 update excel 2024-08-20 14:41:38 +08:00
sk 8df3978077 update excel 2024-08-20 14:14:55 +08:00
sk 07150c660d review 2024-08-19 09:56:08 +08:00
sk e93616dcc9 比赛观战 2024-08-15 16:18:22 +08:00
by db82eabb7c 娃娃机 2024-08-14 14:48:28 +08:00
by 4a86c552f5 配置文件 2024-08-14 14:42:20 +08:00
kxdd 49b0c6cc00 下抓通知添加 2024-08-13 15:33:44 +08:00
sk ed358edfce 娃娃机 2024-08-13 14:07:28 +08:00
sk 81bf26ffc6 添加娃娃机配置 2024-08-12 17:39:33 +08:00
sk fd510661b7 兑换商品支持道具数量信息 2024-08-12 14:53:04 +08:00
sk d46bbd65d0 update excel 2024-08-09 18:33:31 +08:00
sk 28622d6ffc vip等级礼包原价参数 2024-08-09 17:14:59 +08:00
sk e49ecbc1a1 vip等级礼包 2024-08-09 11:37:44 +08:00
sk 731701832f update develop 2024-08-10 01:10:57 +08:00
sk 2e77085fe4 update excel 2024-08-10 01:10:42 +08:00
sk 7ceef9878c update excel 2024-08-06 10:27:08 +08:00
sk d6111cc733 update develop 2024-08-06 08:59:50 +08:00
sk d3c40dde03 update 2024-08-05 14:55:29 +08:00
sk 378b4cc681 update skin 2024-08-05 10:09:10 +08:00
sk 55ed8da8fa update skin 2024-07-31 16:36:26 +08:00
sk 0bb1597aeb update skin 2024-07-31 15:47:28 +08:00
sk e638f43619 fix:dbproxy异常 2024-07-29 18:15:42 +08:00
sk 158aea0bf7 皮肤解锁类型新增vip等级解锁 2024-07-27 18:15:48 +08:00
sk 61b78ce88a update excel 2024-07-26 15:37:30 +08:00
sk fff05f7470 渠道活动开关 2024-07-25 16:01:09 +08:00
sk 699a08f9bb update DB_Skin 2024-07-25 14:24:54 +08:00
sk 6a3dae36e1 皮肤2期 2024-07-24 16:19:08 +08:00
sk a293b03b21 添加推广渠道 2024-07-22 14:49:10 +08:00
sk 5e8c7f2ca0 update excel 2024-07-18 14:40:06 +08:00
sk 25618c0289 update excel 2024-07-18 14:32:51 +08:00
sk 152f41e317 update excel 2024-07-18 14:16:31 +08:00
sk 7e28a059ae update excel 2024-07-17 11:27:30 +08:00
sk ea7e0a29b5 update develop 2024-07-15 15:55:46 +08:00
sk 45f1393600 update develop 2024-07-15 15:33:56 +08:00
sk ae2042bf4d 皮肤自动使用 2024-07-15 15:30:55 +08:00
sk 985c52ce0d update develop 2024-07-15 11:15:15 +08:00
sk 7f2f1eeedf update excel 2024-07-13 18:16:19 +08:00
sk 23c1d1eaab 皮肤功能 2024-07-12 18:05:03 +08:00
sk 9ec909dd58 皮肤功能 2024-07-12 17:11:25 +08:00
sk 29a8319849 update excel 2024-07-11 18:35:30 +08:00
sk 4fc7e30647 update excel 2024-07-11 18:33:02 +08:00
sk db8388c7bc update excel 2024-07-11 18:31:43 +08:00
sk 17b2cd0a64 update excel 2024-07-11 18:30:43 +08:00
sk 7e4be48aff update excel 2024-07-11 18:29:04 +08:00
by 81340b3787 更新配置表 2024-07-11 18:08:50 +08:00
by a8f44cdf47 更新配置表 2024-07-11 18:08:03 +08:00
by e53e94eb4c Merge branch 'develop' of https://git.pogorockgames.com/mango-games/server/game into develop
# Conflicts:
#	data/DB_GameItem.dat
#	data/DB_PropExchange.dat
#	data/DB_Task.dat
#	public
#	xlsx/DB_GameItem.xlsx
2024-07-11 18:04:54 +08:00
by e5a6ebfe76 更新配置表 2024-07-11 18:03:04 +08:00
sk 1123fe94ab 赛季挑战任务 2024-07-11 17:23:56 +08:00
sk 06343ab6fc 通行证活动统计数据 2024-07-11 11:56:34 +08:00
sk b83be4028e update gameitem 2024-07-11 09:58:30 +08:00
sk f2c63ce427 v卡掉落 2024-07-10 11:18:49 +08:00
sk 0d33bf9fb4 动态道具列表 2024-07-09 10:30:26 +08:00
sk b9fbedee9e update develop 2024-07-08 11:55:00 +08:00
sk 1fcf9aa6d2 update develop 2024-07-08 11:51:13 +08:00
sk cdd855bfb2 修改构建脚本 2024-07-08 11:34:19 +08:00
sk 0f2404bf12 修改构建脚本 2024-07-05 18:42:51 +08:00
sk ea80d6e89c update game_item 2024-07-05 16:31:06 +08:00
sk d785e80622 update game_item 2024-07-05 16:27:00 +08:00
sk a9b8b5af02 update task 2024-07-05 15:51:07 +08:00
sk ce2c857ff3 角色红点 2024-07-05 10:49:28 +08:00
sk 090d8ba723 赛季通行证邮件翻译 2024-07-18 00:20:37 +08:00
sk c7992f9fc0 赛季通行证任务 2024-07-10 00:01:12 +08:00
sk 4d1e89cf91 赛季通行证兑换开关 2024-07-06 01:28:45 +08:00
sk cc656a5bbc 赛季通行证重置 2024-07-04 14:51:57 +08:00
sk 2922689951 赛季通行证兑换记录 2024-07-04 10:23:41 +08:00