Commit Graph

7335 Commits (94dde31cf978b6f9644ffaee49977af5d0cd2d19)
 

Author SHA1 Message Date
zhangqiang aa666a5158 【公会】带神印的成员信息报错 2021-06-16 14:50:19 +08:00
ZhangBiao 656c8b3359 【惊喜礼盒】提交 2021-06-16 11:59:52 +08:00
gaoxin fbd02f1a29 【工具】热更和打包工具完成后自动提交 2021-06-16 11:47:07 +08:00
gaoxin 0814f45cfa 【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加 2021-06-16 11:47:00 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
zhangqiang feb6480759 【章节剧情】点击跳过没有返回挂机界面 2021-06-16 10:53:21 +08:00
gaoxin 488f1e8af0 【stream】外部资源添加 2021-06-16 10:48:53 +08:00
JieLing b7e78d9d5f Revert Revert "【包配置】将登录图配置放到streaming文件夹" 2021-06-16 10:44:12 +08:00
wangzhenxing b1425236af [战斗]========觉醒技能提交,困难副本星级条件提交,关卡被动提交 2021-06-16 10:27:56 +08:00
gaoxin b3fca866e8 Revert "【山河试炼】开坑"
This reverts commit 4df5b08d1f.
2021-06-16 10:09:15 +08:00
gaoxin 3dc9dd5d64 Revert "【山河试炼】界面提交"
This reverts commit fbc5316b01.
2021-06-16 10:09:04 +08:00
gaoxin 0e2ec48bdc Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
2021-06-16 10:08:52 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
gaoxin 67e44741f6 Revert "【山河试炼】增加主城红点检测"
This reverts commit e0e8974850.
2021-06-16 10:08:34 +08:00
ZhangBiao e0e8974850 【山河试炼】增加主城红点检测 2021-06-15 20:39:05 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
ZhangBiao 8cd3afb034 【山河试炼】代码提交 2021-06-15 15:46:01 +08:00
gaoxin ab11a7c233 【工具】热更和打包工具完成后自动提交 2021-06-15 15:23:05 +08:00
gaoxin 41dfe3f056 【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加 2021-06-15 14:46:30 +08:00
ZhangBiao fbc5316b01 【山河试炼】界面提交 2021-06-15 14:25:22 +08:00
zhangqiang 75cbaba02e 【章节剧情】点击跳过没有返回挂机界面 2021-06-15 12:17:13 +08:00
gaoxin 84aab7d87d Merge branch 'china/zf_test' into china/dev
# Conflicts:
#	AssetBundles/config.txt
2021-06-15 11:51:00 +08:00
ZhangBiao 173fef6dca Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-15 11:40:56 +08:00
ZhangBiao 4df5b08d1f 【山河试炼】开坑 2021-06-15 11:40:47 +08:00
gaoxin 13d7b61e35 【神将信息】修复切换到装备界面返回无法切换页签的问题 2021-06-15 11:17:15 +08:00
ZhangBiao 6152c52f2c 【牛气冲天】阶段性奖励中的自选箱,点击后可见自选箱的神将内容 2021-06-15 10:22:32 +08:00
gaoxin 46c1fb1070 【森罗】修复转盘游戏点击报错 2021-06-11 20:40:10 +08:00
gaoxin 2140a69391 【森罗】修复转盘游戏点击报错 2021-06-11 20:15:44 +08:00
gaoxin eb27240907 【热更】修复草花cdn报错 2021-06-11 19:26:20 +08:00
gaoxin 2a945825d9 【热更】修复草花cdn报错 2021-06-11 19:24:04 +08:00
gaoxin 57ece39059 【热更】添加草花和灵动专服的配置 2021-06-11 18:28:32 +08:00
gaoxin 8df099eabc 【资源】草花loading图替换 2021-06-11 18:28:05 +08:00
gaoxin c9d6c66259 【热更】添加草花和灵动专服的配置 2021-06-11 18:02:42 +08:00
gaoxin 0f68517a69 【资源】草花loading图替换 2021-06-11 17:37:32 +08:00
gaoxin 20dd0067d3 【资源】喜扑登录背景图替换 2021-06-11 16:11:01 +08:00
gaoxin 627a623a37 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-11 16:10:33 +08:00
gaoxin ebd4135226 【资源】喜扑登录背景图替换 2021-06-11 16:10:12 +08:00
jiaoyangna fe1570f667 神将详情界面修改提交 2021-06-11 16:09:42 +08:00
JieLing 8c161a0ddd Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test 2021-06-11 15:43:25 +08:00
ZhangBiao 4edff2eee8 【升级限量礼包】无剩余礼包逻辑缺失修复
(cherry picked from commit ca9a0199b7)
2021-06-11 14:10:10 +08:00
ZhangBiao 173773517f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-11 14:05:17 +08:00
ZhangBiao ca9a0199b7 【升级限量礼包】无剩余礼包逻辑缺失修复 2021-06-11 14:05:03 +08:00
gaoxin 3ba5186b7b 【热更】没有更新 files文件 2021-06-11 13:19:22 +08:00
gaoxin ee8577248e 【热更】没有更新 files文件 2021-06-11 13:16:55 +08:00
gaoxin 9ec33b5c6d 【热更】添加测试服和喜扑的配置 2021-06-11 13:04:29 +08:00
gaoxin 41af3c5db2 【热更新工具】 2021-06-11 13:04:22 +08:00
gaoxin 65e7971693 【热更】添加测试服和喜扑的配置 2021-06-11 13:02:12 +08:00
gaoxin 7cb79b4de3 【热更新工具】 2021-06-11 12:46:14 +08:00
wangzhenxing 588ca169c9 [战斗]======被动200去掉注释 2021-06-11 11:51:52 +08:00
zhangqiang a9ce0d077e 【章节剧情】点击跳过没有返回挂机界面 2021-06-11 10:58:51 +08:00