Commit Graph

205 Commits

Author SHA1 Message Date
sk 995cabbea6 update DB_GameItem.xlsx 2024-05-10 18:04:25 +08:00
sk 81f0d0fe43 update DB_GameItem.xlsx 2024-05-10 16:55:33 +08:00
sk 32fab5e0ca fix:游戏掉落道具 2024-05-10 15:30:14 +08:00
sk 085d1ef9b2 update DB_GameItem.xlsx 2024-05-10 15:14:53 +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 05f1e805b5 重置水池 2024-05-08 18:33:33 +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 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 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
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 1231f711dc xlsx工具支持索引 2024-04-29 16:50:35 +08:00
lihailiang f7ae511332 存钱罐数据添加 2024-04-29 11:33:53 +08:00
kxdd a2bfdd1d01 合并代码 2024-04-28 18:30:00 +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
kxdd a6a255f04b 1.记牌器时限修改
2.存钱罐配置数据
2024-04-28 17:34:49 +08:00
sk 4d9fee9b11 机器人互动表情 2024-04-28 11:34:37 +08:00
kxdd ec0d303cb6 道具时限类道具修改 2024-04-26 17:46:21 +08:00
sk 23621acfbf 提交public仓库 2024-04-26 17:11:41 +08:00
by 7fb33896de 周卡礼包需求修改 2024-04-26 14:57:26 +08:00
sk b6aa7bec3c 任务系统优化 2024-04-26 09:44:25 +08:00
by cc56a160af 周卡礼包 2024-04-25 11:39:24 +08:00
sk f81781f92d update 2024-04-24 16:02:23 +08:00
sk 456744f16a update data 2024-04-24 15:57:06 +08:00
sk b5c44ff2bb 复仇者联盟 2024-04-24 15:54:49 +08:00
sk df9ebec2e2 update data 2024-04-23 09:16:24 +08:00
sk 0de01b7eaa 复仇者联盟 2024-04-22 18:39:27 +08:00
sk 3d653d6413 道具使用优化 2024-04-19 14:55:10 +08:00
sk 33a087d1d7 开启拉霸游戏 2024-04-19 11:43:13 +08:00
sk c1d2925933 update data 2024-04-17 16:59:14 +08:00
sk 71ad21de65 update_public.bat 2024-04-17 16:56:07 +08:00
sk 4745a067aa 集卡活动 2024-04-17 16:53:01 +08:00
sk 0e53147f13 proto生成优化 2024-04-17 16:52:35 +08:00
sk 737fea1e23 活动代码优化 2024-04-16 17:44:56 +08:00
sk f67df3c8df 集卡活动 2024-04-16 14:07:42 +08:00
sk e99fc18507 test 2024-04-15 16:21:30 +08:00
sk cf7a91def5 test 2024-04-15 16:20:39 +08:00
sk 2140397496 添加集卡活动配置 2024-04-15 16:14:55 +08:00
sk 8549743fcb init 2024-04-15 11:51:32 +08:00
sk 91e798c0c5 init 2024-04-15 11:07:12 +08:00
sk bee5d4bbc9 modify gameparam.json 2024-04-12 14:15:31 +08:00
sk c6342f4b16 modify gameparam.json 2024-04-12 14:10:30 +08:00
sk 2e7dd02d15 Add 'data/' from commit '9961837abeb2c1b30e16fd723b370ac41daede4a'
git-subtree-dir: data
git-subtree-mainline: 0fd1c23df1
git-subtree-split: 9961837abe
2024-04-12 14:07:02 +08:00
sk 0fd1c23df1 删除子模块 2024-04-12 14:06:24 +08:00
sk 9ee74794c1 添加子仓库 2024-04-12 10:49:50 +08:00