Commit Graph

247 Commits (276e0129feb87093ba64cf6b95acbdd5ac501d1b)

Author SHA1 Message Date
jiaoyangna fa6bdeeb6a huoqu huodongzhuangtai tijiao 2020-08-22 16:43:39 +08:00
gaoxin af532fce6e 海外相关修改合并 2020-08-22 16:19:50 +08:00
jiaoyangna f0f8a5d69e qinglong update 2020-08-22 15:42:07 +08:00
jiaoyangna 2646f9418a 2020-08-28 18:32:59 +08:00
ZhangBiao b01a3f31f9 Merge branch '0副本/副本原版留存' into master_develop
# Conflicts:
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/MonsterGroup.xlsx
2020-08-20 15:00:23 +08:00
ZhangBiao e9b8083148 2020-08-20 14:43:48 +08:00
jiaoyangna fa1f5a7c35 五星成长礼提交 2020-08-19 22:03:47 +08:00
ZhangBiao c9cb029494 无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
2020-08-18 10:49:21 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
jiaoyangna 39fb3d113c xuyuan commit 2020-08-12 21:10:27 +08:00
zhangqiang 058b18bc6f 最新表 协议数据 2020-08-12 18:29:11 +08:00
ZhangBiao 5304368d56 神将置换 上阵英雄不可以置换调整
(cherry picked from commit 0b5a3539ab6fe191b7e1497f32e2e6d3285e21ef)
2020-08-12 17:03:39 +08:00
shihongyi e797e9f48d 合并develop &2 进程中,暂时不要更新 2020-08-12 11:37:26 +08:00
zhangqiang b67b99ad93 无尽副本临时新增入口 2020-08-11 16:31:17 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
ZhangBiao 203514d85f 神将置换入口添加 2020-08-05 16:30:02 +08:00
ZhangBiao ee19d26bd3 神将置换界面创建 2020-08-05 15:36:22 +08:00
ZhangBiao c03e9336bc "info" exception 修复 2020-07-29 14:37:12 +08:00
ZhangBiao d2bacc77ca bug修复 2020-07-28 22:41:27 +08:00
jiaoyangna 5d70187da8 副本修改提交 2020-07-28 20:51:28 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00
jiaoyangna 24f9860235 close supreme 2020-07-25 20:35:32 +08:00
jiaoyangna f511cf3380 车迟斗法挑战提交 2020-07-25 19:31:55 +08:00
jiaoyangna b424927bbb tupian tijiao 2020-07-23 16:01:26 +08:00
jiaoyangna aefa2b0cac 添加一个万象境的入口列表 2020-07-23 15:42:42 +08:00
jiaoyangna cafa630185 Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
2020-07-22 20:19:57 +08:00
jiaoyangna aa86f77fea 【充值】表里配的5级,实际创角就有入口 2020-07-21 11:31:05 +08:00
jiaoyangna 03107d240a 轩辕宝镜提交 2020-07-21 10:42:20 +08:00
jiaoyangna 9b7e47aaef Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
#	data_execl/base_data/RaceTowerConfig.xlsx
2020-07-20 20:00:31 +08:00
jiaoyangna 04e9a24db0 xuanyuanmirror tijiao 2020-07-20 19:46:08 +08:00
zhangqiang f24e7cbef3 排行榜请求修改 2020-07-20 16:38:26 +08:00
zhangqiang c6b5321424 bug 2020-07-17 20:52:44 +08:00
zhangqiang 98670958a0 首冲拍脸 寻宝红点条件 2020-07-17 13:56:30 +08:00
zhangqiang ebca764861 首冲 2020-07-17 11:27:03 +08:00
ZhangBiao cb56ec6b22 森罗小游戏bug修改 2020-07-16 16:59:46 +08:00
jiaoyangna 3a85c6e339 分解,限时召唤提交 2020-07-10 18:29:38 +08:00
JieLing d08552ca2f 外网0.16.13 内网0.15.24 2020-06-30 18:59:44 +08:00
JieLing 8c61581548 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 75a3f83194 内网0.15.16 外网 0.16.7 2020-06-19 20:19:35 +08:00
JieLing e189462ac9 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
JieLing cf5f3e9952 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
JieLing b499b77bbe 外网0.16.4版本热更 2020-06-08 13:57:30 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 063868ce73 外网包 0.16.1 2020-05-25 19:16:23 +08:00
JieLing 266b9065d8 测试版本 带热更 0.15.1 2020-05-15 16:52:35 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00