Commit Graph

8276 Commits (92f3ee123c6c49397e7f02a57743f7cd6e30fb6e)
 

Author SHA1 Message Date
ZhangBiao 11543e53a0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-26 11:09:20 +08:00
ZhangBiao beea770b78 【竞技场】适配调整 2021-07-26 11:09:07 +08:00
zhangqiang e01694fa28 【跨服天梯】战斗记录协议修改 2021-07-26 11:03:45 +08:00
jiaoyangna 9a1d361c63 Revert "装备界面改动"
This reverts commit c131d41d58.
2021-07-26 10:03:10 +08:00
jiaoyangna 4590076eb9 Revert "宝物培养修改提交"
This reverts commit bcd0651029.
2021-07-26 10:00:59 +08:00
jiaoyangna 4c9871767f Revert "强化和精炼界面修改"
This reverts commit 9d78af51e0.
2021-07-26 10:00:49 +08:00
jiaoyangna d53776b558 Revert "红点修改提交"
This reverts commit 734efe7b52.
2021-07-26 10:00:07 +08:00
jiaoyangna c93f98dabc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-26 09:55:42 +08:00
ZhangBiao 1634345c1e 【清除log】 2021-07-26 09:48:18 +08:00
jiaoyangna b49166afe1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 19:39:25 +08:00
jiaoyangna 734efe7b52 红点修改提交 2021-07-24 19:36:34 +08:00
ZhangBiao 7111f53936 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 19:34:13 +08:00
ZhangBiao 7e9fad28b7 【万象商会】提交 2021-07-24 19:33:56 +08:00
jiaoyangna 06dfb74d33 活动修改提交 2021-07-24 19:33:54 +08:00
jiaoyangna 7a9100dfec Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 19:08:06 +08:00
jiaoyangna e5d387c37d 主题活动任务修改提交 2021-07-24 19:07:56 +08:00
ZhangBiao 4c73ac0976 【万象商会】刷新 2021-07-24 18:59:42 +08:00
jiaoyangna 7b9a5e535c 红点检测修改提交 2021-07-24 18:16:05 +08:00
jiaoyangna 8d76903f10 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 18:13:45 +08:00
jiaoyangna 8226901eb8 任务修改提交 2021-07-24 18:13:40 +08:00
ZhangBiao 5bba13ccc0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 17:46:03 +08:00
ZhangBiao 9a7ef2f0a2 【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失 2021-07-24 17:45:48 +08:00
jiaoyangna 1e70bdb2ca 活动修改提交 2021-07-24 17:38:48 +08:00
ZhangBiao ccc208b2c4 【万象商会】界面关闭 2021-07-24 17:02:30 +08:00
ZhangBiao c045a944ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-24 16:30:34 +08:00
ZhangBiao b910dcfc6f 【主题活动商店】增加商店类型 2021-07-24 16:30:19 +08:00
jiaoyangna 9d78af51e0 强化和精炼界面修改 2021-07-24 16:22:16 +08:00
jiaoyangna 24363d5c03 【ID1009862】
15日登录送白泽活动加入预告功能
2021-07-24 15:46:00 +08:00
jiaoyangna 6c59983568 工会查看信息报错修改 2021-07-24 15:18:38 +08:00
ZhangBiao 7bc3a3d460 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:23:05 +08:00
ZhangBiao c3a5e5b7de 【主题活动】bannerSetNative 2021-07-23 19:22:56 +08:00
jiaoyangna fd7d51168d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 19:12:46 +08:00
jiaoyangna bcd0651029 宝物培养修改提交 2021-07-23 19:12:42 +08:00
ZhangBiao 38bbb808b4 【主题活动】商店 2021-07-23 19:05:53 +08:00
wangzhenxing ff6639ebfb 【称号】=====称号属性显示修改 2021-07-23 18:34:07 +08:00
ZhangBiao d571e3126d bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/23,18:33:47 2021-07-23 18:33:47 +08:00
ZhangBiao 05f4718241 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 18:26:35 +08:00
ZhangBiao 25ace8439d 【公会】旗帜位置调整 2021-07-23 18:26:28 +08:00
wangzhenxing 20bf67d50e 【称号】====称号特效显示修改,称号特效预设修改 2021-07-23 18:23:55 +08:00
zhangqiang 3d13fbca6d 【拍脸修改】回退 2021-07-23 17:51:22 +08:00
gaoxin 3d3d04fd77 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 17:45:47 +08:00
gaoxin d0249ac5f0 【打包工具】优化Android出包时替换文件夹导致部分.so文件被删除的问题 2021-07-23 17:45:35 +08:00
ZhangBiao 8a90b87942 【新副本界面】心魔次数文字错误修改,和弹窗修改 2021-07-23 17:43:30 +08:00
ZhangBiao 627954ae3f 【大闹天宫】层数错误提交 2021-07-23 17:26:24 +08:00
ZhangBiao 2dc965137b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 17:15:15 +08:00
ZhangBiao 93469872a7 【主题活动】提交 2021-07-23 17:15:04 +08:00
zhangqiang beb91b9407 【拍脸报错】 2021-07-23 16:43:51 +08:00
wangzhenxing 3dc2970f1f [功能]============15日登陆预告预设修改,整点自动刷新 2021-07-23 16:27:33 +08:00
ZhangBiao d114a6404a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-23 15:56:00 +08:00
ZhangBiao bd5b473246 【大闹天宫】增加层数显示 2021-07-23 15:55:49 +08:00