Commit Graph

927 Commits (4902f4bc16acc310e1646f635ef45cc5c8f6b8b8)
 

Author SHA1 Message Date
wangyuan 900a0bf81d Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 16:54:21 +08:00
wangyuan 8a76db460c 修改名称 2019-05-16 16:53:11 +08:00
wangyuan 285319bb9f lua 2019-05-16 16:45:50 +08:00
wangyuan bcbab8834d fix 2019-05-16 16:45:11 +08:00
wangyuan 534d6f0b75 挂机刷新发现boss lua 2019-05-16 16:34:04 +08:00
wangyuan 5397f27327 挂机刷新发现boss 2019-05-16 16:33:33 +08:00
wangyuan 3bcbe3aa9b Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 14:44:31 +08:00
wangyuan fadd30c694 delete unuse 2019-05-16 14:44:16 +08:00
wangyuan e96a73b6ab 挂机lua 2019-05-16 14:38:11 +08:00
wangyuan e6532f394e Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 14:37:13 +08:00
wangyuan 9872ff269f 挂机协议 2019-05-16 14:36:57 +08:00
gaojie 7563a5c03a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-05-14 17:15:01 +08:00
gaojie 7254e72af6 fix 2019-05-14 17:14:13 +08:00
wangyuan 5edf237ba0 lua 2019-05-14 16:31:45 +08:00
wangyuan d82265d293 time function 2019-05-14 16:31:30 +08:00
wangyuan 90dfae824a 秘盒今日抽取次数 2019-05-14 13:44:23 +08:00
wangyuan 1b1d14f4a2 fix 2019-05-14 10:36:48 +08:00
wangyuan d13086812d fix 2019-05-14 10:23:58 +08:00
wangyuan be9d558f17 时间控制功能 2019-05-14 10:23:05 +08:00
wangyuan 2ba6acdf68 增加是否跳过战斗 2019-05-13 15:17:17 +08:00
gaojie b7be080011 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-13 14:58:05 +08:00
gaojie 7035b62cc4 商店刷新 2019-05-13 14:58:01 +08:00
wangyuan 56553a36a3 查看战斗回放 2019-05-13 12:07:20 +08:00
gaojie d88f58b835 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/CommonProto.proto
2019-05-11 17:22:51 +08:00
gaojie 5265a6302b 获取商店信息 2019-05-11 17:22:16 +08:00
wangyuan 5b9874121c arena record 2019-05-11 16:24:06 +08:00
wangyuan c1396c4970 秘盒协议 2019-05-11 15:16:37 +08:00
wangyuan 08d899480e 删除无效字段 2019-05-11 10:47:37 +08:00
wangyuan bdaff6d8b0 我的进攻队伍 2019-05-10 17:43:12 +08:00
wangyuan 5f9a967322 只给我自己分数&排名 2019-05-10 16:15:50 +08:00
wangyuan aa28a176ba 竞技场进攻 2019-05-10 13:42:09 +08:00
wangyuan f4f4ba33f4 秘盒 2019-05-10 13:33:25 +08:00
wangyuan 427b1e8f92 排行榜信息 2019-05-10 10:31:06 +08:00
wangyuan 04f4958ab3 删除排名 2019-05-10 10:11:57 +08:00
wangyuan c62740355b fight time 2019-05-09 17:44:53 +08:00
wangyuan ffc5f435ee fix 2019-05-09 16:34:31 +08:00
wangyuan ebe0467572 fix 2019-05-09 15:50:20 +08:00
wangyuan 7cf2919302 获取竞技场基本信息 2019-05-09 15:37:36 +08:00
wangyuan 02f7b662b4 重铸等级 2019-05-09 11:03:49 +08:00
wangyuan 5df64e1a0b 装备重铸确认 2019-05-07 11:05:58 +08:00
wangyuan 4f8acaf535 gm response 2019-04-30 15:56:18 +08:00
jiahuiwen 918df26d74 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-30 13:49:36 +08:00
jiahuiwen 81ddc08e7b 任务完成奖励 2019-04-30 13:49:30 +08:00
wangyuan aea6c90563 lua 2019-04-30 11:01:18 +08:00
wangyuan 56b8cdf80e gm response 2019-04-30 10:27:36 +08:00
jiahuiwen 84fcee959a 战斗事件 nextEventId 放到战后给 2019-04-29 15:10:25 +08:00
gaojie 4432eafb25 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-25 18:16:33 +08:00
wangyuan a38049b909 挂机 界面不展示背包信息 2019-04-25 23:52:24 +08:00
gaojie 4af0fa2467 起名 2019-04-25 18:16:28 +08:00
gaojie cde6387572 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-25 14:52:14 +08:00