Commit Graph

1576 Commits (master_zzxx_01)

Author SHA1 Message Date
duhui 32ed71ccba Merge branch 'master_test_gn' into dev_dh_bt 2022-09-14 15:59:40 +08:00
duhui 8ba87b1dcf gm修改器购买礼包 2022-09-14 15:57:59 +08:00
duhui f48f2a6bae 建木神树修改 2022-09-05 13:34:50 +08:00
duhui 380d5d9efa 摘星阁,装备重置,删错了 2022-09-02 10:26:10 +08:00
duhui f25e2a0165 摘星阁,装备重置 2022-09-02 10:13:10 +08:00
duhui fe652a9fc6 摘星阁,装备重置 2022-09-02 09:53:14 +08:00
yuanshuai 8096e988c2 ... 2022-09-01 10:09:34 +08:00
duhui fc9fc83e2e Merge branch 'master_prb_gn' into dev_equip 2022-08-30 16:58:14 +08:00
duhui 1460c8d2ac 车迟斗法挑战记录 2022-08-23 17:15:02 +08:00
duhui 8b23db5fb8 摘星阁,装备 2022-08-19 17:36:35 +08:00
duhui 65d530a099 森罗环境扫荡 2022-08-16 18:27:27 +08:00
duhui 727400720f 森罗幻境修改协议 2022-08-16 18:15:51 +08:00
duhui ce37ffbb99 逍遥游修改 2022-08-16 14:59:27 +08:00
duhui 7b61fbff14 热度排行榜协议补充 2022-07-27 16:47:02 +08:00
duhui f3e8cf764a 英雄热度排行榜 2022-07-22 17:51:13 +08:00
duhui 083f9dcd13 比数字协议新增 2022-07-11 11:11:11 +08:00
duhui b3ac450ddd 比数字小游戏 2022-07-11 10:51:36 +08:00
duhui 0166bd77b4 周卡协议修改 2022-05-31 15:53:20 +08:00
wangzhenxing 660e8ff9fc 协议修改 2022-05-31 14:59:08 +08:00
duhui 794b58cde5 新周卡协议 2022-05-30 16:28:09 +08:00
xuexinpeng d9b6847131 山河社稷图数据分页请求 2022-05-05 15:01:04 +08:00
xuexinpeng 396d1b34ec 化身之力激活给掉落 2022-04-29 16:09:10 +08:00
xuexinpeng 2e4a889750 身外化身 2022-04-24 13:55:17 +08:00
xuexinpeng 6a97dc0275 身外化身升级 2022-04-22 16:25:51 +08:00
duhui 732010cc19 神印替换 2022-04-22 13:30:30 +08:00
xuexinpeng 04da858405 身外化身 升星 2022-04-22 13:28:58 +08:00
xuexinpeng c9cd828071 身外化身 2022-04-21 18:32:09 +08:00
xuexinpeng 4a00a69b48 身外化身 2022-04-21 18:10:09 +08:00
duhui 232dc92246 魂印升品 2022-04-21 18:00:48 +08:00
xuexinpeng ef0d9f2492 身外化身 2022-04-21 11:58:19 +08:00
xuexinpeng a6a5dd1b5f 身外化身 2022-04-21 11:57:17 +08:00
xuexinpeng 6764acbd10 变身卡升级 升星 2022-04-21 11:54:34 +08:00
xuexinpeng e9bc74faa7 挑战副本变量名修改 2022-04-21 17:55:51 +08:00
xuexinpeng 5b46c22857 挑战副本 2022-04-20 16:23:29 +08:00
duhui ac5eb1dbbe 神印 2022-04-20 10:29:41 +08:00
xuexinpeng 90923b974c 添加战斗结果 2022-04-18 18:18:29 +08:00
xuexinpeng 26d0eb8565 挑战副本(无尽副本,宝物副本) 2022-04-14 14:28:23 +08:00
xuexinpeng 2e0eaab404 探索优化 2022-04-07 11:32:10 +08:00
yuanshuai 5545704f4f 新增阵营字段 2022-03-23 18:16:49 +08:00
xuexinpeng 8e2545f532 探索事件 2022-03-23 16:08:31 +08:00
xuexinpeng 3e4df2b5c8 探索事件 2022-03-23 13:45:46 +08:00
yuanshuai 5e55354835 战斗新增阵营字段 2022-03-18 14:27:14 +08:00
xuexinpeng 27e6967465 探索事件 2022-03-18 13:34:06 +08:00
yuanshuai 910ac27336 新阵营:神魔协议号添加 2022-03-18 11:50:50 +08:00
xuexinpeng 42e575d3f8 探索事件 2022-03-18 11:44:38 +08:00
xuexinpeng bea88313c0 探索事件 2022-03-18 11:43:54 +08:00
yuanshuai 8d9c51d1e2 注释修改 2022-03-17 17:47:56 +08:00
yuanshuai 533096e392 神魔功能相关协议提交 2022-03-17 17:35:15 +08:00
xuexinpeng a9c62fd9b7 探索事件 2022-03-17 16:06:46 +08:00
duhui 7e216992ca 车迟斗法获取挑战列表本人积分修改为long 2022-03-11 13:26:28 +08:00
duhui c261682302 回退 2022-03-11 10:53:35 +08:00
duhui d0dbdab4b1 车迟斗法积分超过int上限问题处理 2022-03-10 18:21:17 +08:00
duhui 578e076695 车迟斗法积分改long类型 2022-03-10 10:03:51 +08:00
duhui 39a8e70e09 【车迟斗法】增加serverName 2022-03-05 09:59:25 +08:00
jiahuiwen f853aa5ffc 登录协议注释修改 2022-03-01 13:46:07 +08:00
xuexinpeng f03c8727b6 探索杀敌数indication 2022-02-03 16:04:25 +08:00
xuexinpeng 954aede3cd 工会探索杀敌数 2022-01-19 15:34:36 +08:00
duhui f69a7dc6aa 方法顺序 2022-01-14 09:58:31 +08:00
xuexinpeng d09934e701 【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息 2022-01-13 18:28:25 +08:00
jiahuiwen b89256e4ec Merge branch 'master_test_gn' into master_test_gn_upStarHeroActivity 2022-01-11 11:19:12 +08:00
yuanshuai 0cb98589b4 协议修改 2022-01-08 13:52:45 +08:00
yuanshuai 0182965fb8 升星活动选择英雄协议提交 2022-01-08 13:39:05 +08:00
yuanshuai 8beb0773f7 添加注释 2022-01-08 13:38:17 +08:00
duhui 71567a19bd 补充提交 2022-01-06 16:16:14 +08:00
duhui 70e80a21da Merge branch '开发/dev_dh' into master_test_gn
# Conflicts:
#	protos/MessageTypeProto.proto
2022-01-06 16:15:56 +08:00
xuexinpeng 6fe6780220 Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	protos/MessageTypeProto.proto
2022-01-06 16:11:04 +08:00
duhui 77c4183e8d Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts:
#	protos/MessageTypeProto.proto
2022-01-05 10:18:09 +08:00
duhui 99d2a71575 【家园协议1.0.7】家园装备强化展示 2021-12-30 18:30:02 +08:00
xuexinpeng f6079eea0d 森罗幻境自动挂机奖励展示 2021-12-30 16:00:47 +08:00
duhui a8bb729b46 【家园协议1.0.6】装备强化属性展现给玩家 2021-12-29 15:07:03 +08:00
duhui 7344c22064 【家园协议1.0.5】装备只能单点强化 2021-12-29 11:06:29 +08:00
duhui cf4413e08d 【家园协议1.0.4】装备信息返回内容添加突破等级 2021-12-29 10:52:28 +08:00
duhui fcb66aa2a1 【家园协议1.0.3】添加装备突破 2021-12-29 10:39:44 +08:00
xuexinpeng 62f1d03132 Merge branch 'master_test_gn' into master_test_gn_xxp
# Conflicts:
#	protos/CommonProto.proto
2021-12-27 10:08:22 +08:00
xuexinpeng 217bff9b08 tansuo 2021-12-24 17:33:41 +08:00
duhui a1e0e1fdc3 Merge branch 'master_test_gn' into 开发/dev_dh 2021-12-23 18:09:28 +08:00
xuexinpeng 6f9d61b0e9 数据结构-公用键值对 2021-12-23 13:46:20 +08:00
duhui b44dccd3f2 【家园协议1.0.2】家园返回去除掉落,添加建筑解锁推送协议 2021-12-23 13:32:37 +08:00
yuanshuai 5ee84a21db Merge branch 'master_test_gn' into master_test_gn_lifeGrid 2021-12-23 09:54:10 +08:00
xuexinpeng a2f6dc1df4 活动关闭特殊推送 2021-12-23 00:24:13 +08:00
duhui c296555332 【家园协议1.0.1】注释修改 2021-12-22 18:27:20 +08:00
duhui 64949fb7f1 【家园协议1.0】旧内容修改,添加装备强化协议 2021-12-22 18:01:08 +08:00
xuexinpeng d618e1d6e9 探索 2021-12-22 14:36:31 +08:00
xuexinpeng c0db5c4dbb 探索 2021-12-22 11:00:20 +08:00
xuexinpeng 511b9695e1 探索 2021-12-22 10:51:33 +08:00
xuexinpeng 1cd289eec5 探索 2021-12-21 18:21:00 +08:00
duhui 3a0514d753 浮生门 2021-12-20 15:59:21 +08:00
xuexinpeng b6f0b402ed Merge branch 'master_test_gn' into master_test_gn_xxp 2021-12-20 11:31:00 +08:00
xuexinpeng ee9be4884e 探索玩法 2021-12-20 09:48:48 +08:00
jiahuiwen 96babcfc76 神将回退 2021-12-14 16:46:27 +08:00
xuexinpeng e85d49065e 探索地图 2021-12-13 14:13:47 +08:00
yuanshuai c26d48d7ad 添加逍遥游累计通关次数字段 2021-12-13 11:57:36 +08:00
yuanshuai 24fdc5b21f Merge branch 'master_test_gn' into master_test_gn_lifeGrid 2021-12-13 10:45:30 +08:00
duhui b1516efe6b 公会boss伤害超上限 2021-12-10 18:27:37 +08:00
duhui 7f2c87c305 公会boss伤害超上限 2021-12-10 16:44:26 +08:00
yuanshuai f9a5b1f70d 命石合成添加掉落 2021-12-08 16:26:45 +08:00
yuanshuai 3bf9f47ac4 协议修改 2021-12-07 15:53:17 +08:00
yuanshuai e11cdac272 命格协议修改 2021-12-07 14:33:38 +08:00
yuanshuai eee8bcedd5 命格协议修改 2021-12-07 13:18:46 +08:00
yuanshuai 6801b91f83 协议注释修改 2021-12-07 13:08:06 +08:00
yuanshuai f2e3e22856 命格数据初始化协议提交 2021-12-07 10:38:45 +08:00
yuanshuai 206549e7c5 命格协议提交 2021-12-07 09:34:32 +08:00
duhui c444d70ecd 字段修改 2021-12-06 17:35:16 +08:00
duhui ff332c0887 大闹天宫,怪物加神魂等级 2021-12-06 15:29:38 +08:00
duhui c57563a1a6 连续礼包优化 2021-12-02 15:10:30 +08:00
yuanshuai 56b5c2c3b7 天地洪炉协议提交 2021-11-26 10:30:28 +08:00
yuanshuai 2a4f830218 天地烘炉选择up卡协议 2021-11-25 17:24:15 +08:00
duhui 0c77b925ff Merge branch '开发/dev_dh' into master_test_gn 2021-11-25 18:15:01 +08:00
yuanshuai 941aad2610 Merge branch 'master_test_gn_fabao' into master_test_gn 2021-11-19 17:59:19 +08:00
yuanshuai cb6dd8b9cf Merge branch 'master_test_gn' into master_test_gn_fabao 2021-11-18 17:50:40 +08:00
xuexinpeng 29d34532dd 灵脉秘境 2021-11-18 17:45:23 +08:00
xuexinpeng 3670be7393 灵脉秘境 2021-11-18 13:21:22 +08:00
duhui 423834b81c Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts:
#	protos/CommonProto.proto
2021-11-17 18:21:39 +08:00
xuexinpeng 0527b1590d 灵脉秘境的indication 2021-11-17 16:45:19 +08:00
xuexinpeng c6027b4a34 灵脉 2021-11-16 18:31:08 +08:00
duhui 52e7d63256 身外化身功能 2021-11-16 16:08:03 +08:00
xuexinpeng 4c4c5de25c 灵脉秘境 2021-11-16 14:11:36 +08:00
xuexinpeng 582668d4fa 灵脉秘境 2021-11-16 13:57:12 +08:00
duhui e737288254 礼包添加类型 2021-11-30 15:17:02 +08:00
yuanshuai 95f4388736 法宝之魂协议提交 2021-11-15 14:04:39 +08:00
xuexinpeng 3a0b37200b 灵脉秘境 2021-11-12 11:23:09 +08:00
yuanshuai 2e99b61df7 森罗幻境阵容添加神魂等级字段 2021-11-05 15:11:22 +08:00
yuanshuai e3349a1edf Merge branch 'master_test_gn_godsoul' into master_test_gn 2021-11-03 19:01:19 +08:00
xuexinpeng 76990b8420 周卡 2021-10-29 16:32:00 +08:00
xuexinpeng 674c89e1c0 周卡 2021-10-29 14:20:32 +08:00
yuanshuai 8a2a6ec9ab 战中神魂等级数据提交 2021-10-29 11:37:35 +08:00
yuanshuai 3b91b30cca Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts:
#	protos/CommonProto.proto
2021-10-29 11:36:50 +08:00
duhui 574e07de13 车迟斗法伤害溢出问题 2021-10-28 16:58:14 +08:00
xuexinpeng 57ce524e26 周卡协议 2021-10-28 15:05:39 +08:00
yuanshuai 4b8c0d895d 主角技能添加性别字段 2021-10-26 17:06:38 +08:00
yuanshuai 04d0c38171 添加神魂等级 2021-10-26 16:00:37 +08:00
yuanshuai af5285bc3c Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-26 15:13:49 +08:00
yuanshuai 6601976474 神魂协议修改 2021-10-25 10:27:37 +08:00
xuexinpeng e761da165d 跨服yx战斗记录新加对手分值 2021-10-22 16:25:13 +08:00
yuanshuai fd69df13e9 神魂相关协议提交 2021-10-22 16:12:50 +08:00
yuanshuai 7288e92a2e Merge branch 'master_test_gn' into master_test_gn_godsoul 2021-10-22 13:50:40 +08:00
yuanshuai d02da5bb58 协议修改 2021-10-21 18:31:04 +08:00
xuexinpeng f044946b6e 一键领取到的奖励id 2021-10-21 17:39:07 +08:00
yuanshuai fdce1162e1 Merge branch 'master_test_gn' into master_test_gn_godsoul
# Conflicts:
#	protos/CommonProto.proto
#	protos/HeroInfoProto.proto
2021-10-21 16:31:21 +08:00
yuanshuai 8f6912f20e 修行技能战斗相关协议修改 2021-10-21 15:31:11 +08:00
yuanshuai 9f5403b866 神魂漏提交协议 2021-10-13 18:12:39 +08:00
yuanshuai 260fe178c2 Merge branch 'master_test_gn_practiceSkill' into master_test_gn
# Conflicts:
#	protos/CommonProto.proto
#	protos/PlayerInfoProto.proto
2021-10-20 18:41:12 +08:00
xuexinpeng 4da566bd2f 新月卡字段 2021-10-20 18:11:18 +08:00
duhui 5d3d1b5589 轮次 2021-11-03 23:52:14 +08:00
duhui cb1298292e 御剑行,添加轮次 2021-10-20 15:42:26 +08:00
duhui 06f612d309 Merge branch 'dh_dev_ridingsward' into master_test_gn 2021-10-20 13:45:07 +08:00
yuanshuai 997ba0febc 战斗协议修改,新增修行技能数据 2021-10-20 13:20:44 +08:00
jiahuiwen ad0c76fdbc 主角修为等级提升 2021-10-19 17:49:58 +08:00
jiahuiwen 195f28b080 增加 山河社稷图 每日领取奖励 resopnse 2021-10-19 15:29:23 +08:00
jiahuiwen a43a465a5e 山河社稷图领取每日奖励 2021-10-19 15:20:07 +08:00
jiahuiwen 8947125973 主角修为 2021-10-19 13:45:39 +08:00
yuanshuai 6660ec9d55 修行技能相关协议提交 2021-10-19 10:00:40 +08:00
xuexinpeng 30347f07df Merge branch 'master_test_gn' into master_test_gn_xxp 2021-10-16 11:45:05 +08:00
xuexinpeng 8b12b8e173 玉虚论道红点请求 2021-10-14 18:23:40 +08:00
xuexinpeng 3102fcf961 添加神树等级 2021-10-14 17:18:39 +08:00
duhui cb57cb7491 Merge branch 'master_test_gn' into dh_dev_ridingsward
# Conflicts:
#	protos/CommonProto.proto
2021-10-14 16:19:17 +08:00
yuanshuai d130618ee5 添加装备图鉴数量修改推送 2021-10-14 14:56:28 +08:00
xuexinpeng 26afa7210a Merge branch 'master_test_gn' into master_test_gn_xxp 2021-10-13 20:02:00 +08:00
yuanshuai 037e1cb052 装备图鉴协议提交 2021-10-13 18:12:03 +08:00
duhui 52cefc6929 投注次数 2021-10-13 18:03:13 +08:00
duhui 4c01ac7a5b 玩家投注次数 2021-10-13 15:55:01 +08:00
duhui 62c144c683 修改 2021-10-13 14:49:59 +08:00
duhui ec1ed1f0b6 修改 2021-10-13 14:34:32 +08:00
duhui aa69df6f51 错误参数 2021-10-12 11:27:06 +08:00
duhui 1edbcdd876 比赛结果 2021-10-12 11:23:43 +08:00
duhui 2b3dcc650d 御剑行,协议补充 2021-10-12 11:04:10 +08:00
duhui 28baad3c5f 小修改 2021-10-12 11:01:30 +08:00
duhui 3b048b39f6 御剑行,协议修改 2021-10-12 11:00:40 +08:00
duhui 58a36ebdd1 参数修改 2021-10-11 15:32:23 +08:00
duhui 09b4b3323f 协议报错修改 2021-10-11 11:05:06 +08:00
duhui 2c50c93a2f 御剑活动 2021-10-11 10:23:07 +08:00
duhui f5aabbbee0 御剑飞行 协议 2021-10-11 09:57:26 +08:00
xuexinpeng 26fc056a1d 战斗回放加战力显示 2021-10-09 20:25:31 +08:00
jiahuiwen 031b09cd7e 玩家升级增加道具 2021-10-08 11:24:47 +08:00
yuanshuai fd51fcd89c 神魂协议提交 2021-09-30 11:49:55 +08:00
yuanshuai 9246816aca Merge branch 'master_test_gn_Likable' into master_test_gn 2021-09-29 15:46:06 +08:00
yuanshuai 567c51c357 好感度协议修改 2021-09-24 13:47:40 +08:00
jiahuiwen a88b31350f Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_protocol into master_test_gn
# Conflicts:
#	protos/PlayerInfoProto.proto
2021-09-23 14:30:46 +08:00
jiahuiwen 4f64dfaf59 增加服务器开服时间 2021-09-23 14:30:04 +08:00
yuanshuai 5943b3b6bc 协议修改提交 2021-09-23 10:06:50 +08:00
duhui 3f609cf024 玲珑宝阁多抽 2021-09-23 09:41:46 +08:00
yuanshuai ba358bc75e 协议修改 2021-09-22 20:56:15 +08:00
yuanshuai 5be06d0c1a 好感度协议提交 2021-09-22 17:10:37 +08:00
yuanshuai fcbd24e755 Merge branch 'master_test_gn_ys' into master_test_gn
# Conflicts:
#	protos/CommonProto.proto
2021-09-22 15:16:50 +08:00
duhui c576985f49 Merge branch 'dh_dev_sevenworld' into master_test_gn
# Conflicts:
#	protos/PlayerInfoProto.proto
2021-09-22 13:56:56 +08:00
duhui 1f585e2f31 不用消息体 2021-09-24 00:44:08 +08:00
xuexinpeng 1a7505ceef test_gn合到xxp 2021-09-22 13:47:22 +08:00
jiahuiwen 78b1fc1898 Revert "回滚,当前版本不上"
This reverts commit dc2d3ac2a3.
2021-09-17 17:06:43 +08:00
jiahuiwen 78fd94446e Merge branch 'master_test_gn' into master_prb_gn 2021-09-17 16:49:01 +08:00
duhui dc2d3ac2a3 回滚,当前版本不上 2021-09-27 11:14:51 +08:00
duhui 49b59587c7 鸿蒙阵推送 2021-09-19 01:25:52 +08:00
duhui e9cb856ee5 Merge branch 'master_test_gn' into dh_dev_sevenworld 2021-09-17 14:23:50 +08:00
duhui 0b4ced851c 七界挑战 2021-09-16 19:14:01 +08:00
yuanshuai 695dcd1f7e 四象心法协议 2021-09-14 13:52:25 +08:00
yuanshuai 43d0bf08ef Merge branch 'master_test_gn' into master_test_gn_ys
# Conflicts:
#	protos/PlayerInfoProto.proto
2021-09-14 12:00:45 +08:00
duhui 22a5f15772 十绝阵伤害int改long 2021-09-14 10:16:11 +08:00
xuexinpeng db218c6280 玉虚论道战力回放 2021-09-13 16:13:42 +08:00
wangzhenxing 80adf62bb6 协议字段修改 2021-09-11 14:58:19 +08:00
wangzhenxing e62c871d7a 协议添加字段 2021-09-11 00:47:47 +08:00
xuexinpeng 8ae56119d9 玉虚论道 2021-09-10 15:12:08 +08:00