Commit Graph

7824 Commits (7d8bb2bc36ef350bd2cac8eedd0416721bd364dd)

Author SHA1 Message Date
gaoxin 7d8bb2bc36 【Version工具】修改配置文件走svn 2021-09-03 15:54:33 +08:00
ZhangBiao 21d6b01106 【修行】元婴期突破空白文字修改 2021-09-03 15:10:38 +08:00
ZhangBiao 68791a5745 【战力】连续打开变负数修改 2021-09-03 11:10:24 +08:00
ZhangBiao 009a17a25a 【战力】漏提交 2021-09-03 10:19:51 +08:00
ZhangBiao 688da4bcb0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-03 09:52:08 +08:00
gaoxin 104100ad01 【还原图片优化工具】 2021-09-03 09:49:30 +08:00
ZhangBiao 5ea7acdef7 【幸运探宝】提交 2021-09-02 22:35:44 +08:00
ZhangBiao 72c42eb871 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 22:25:08 +08:00
ZhangBiao 08e8944e47 【战力问题】PVP增减伤引起的战力不统一问题修改 2021-09-02 22:24:58 +08:00
gaoxin 316adf6fbd 【登录】优化登录失败时,界面文字提示 2021-09-02 22:12:58 +08:00
ZhangBiao fbfa80611a 【幸运摊薄】时间显示 2021-09-02 20:58:11 +08:00
ZhangBiao f6d05b433d 【神将属性】本服排行榜查看神将属性,与背包神将情报中属性不一致 2021-09-02 18:07:49 +08:00
gaoxin 45ddf4e09e 【防沉迷】修复切服不生效,添加防沉迷登录提示 2021-09-02 14:27:18 +08:00
jiaoyangna 1dd4e984cb 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-02 14:22:50 +08:00
jiaoyangna f087a9aa71 Revert "预设适配修改提交"
This reverts commit a592f4d5f3.
2021-09-02 14:20:26 +08:00
ZhangBiao d4f94b9d9d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 13:44:51 +08:00
ZhangBiao 61c16f60f2 【优化】将竞技场赛季倒计时提示文字改为能看清的文字 2021-09-02 13:44:42 +08:00
gaoxin 5eea8ada97 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 13:44:18 +08:00
gaoxin f1dc1dd49a 【sdk】修改获取channel时返回的默认值 2021-09-02 13:43:58 +08:00
ZhangBiao 9fe8a5c0d2 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 11:34:26 +08:00
ZhangBiao d3f7213de0 【鸿蒙阵】1级的九河神女,再加一个330级觉醒将,送掉1级将,可以直接开启鸿蒙碑 2021-09-02 11:34:15 +08:00
jiaoyangna a592f4d5f3 预设适配修改提交 2021-09-02 11:24:09 +08:00
ZhangBiao bbca72b6bf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-02 11:19:39 +08:00
ZhangBiao 6bbf30e344 【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000 2021-09-02 11:19:29 +08:00
liujiaqi e9bb0163de 【资源】杨戬施法特效 2021-09-02 10:42:28 +08:00
ZhangBiao 00bd84f77c 【升星有礼】增加新将例会 2021-09-02 09:57:17 +08:00
jiaoyangna 3ef0ad39b6 【ID1010167】
【乾坤宝盒】许愿魂印弹窗中,魂印图标下方添加道具名称
2021-09-01 20:06:09 +08:00
jiaoyangna 5b8001ce28 【ID1018329】
【宝物分解】背包界面分解宝物,分解后返回,依然弹出已被分解的宝物

(cherry picked from commit 41831fad79)
2021-09-01 19:36:19 +08:00
wangzhenxing 3e36a537b3 [战斗]======= 目标选择逻辑 生命百分比最低 不选有不灭的 显示层:死亡后怒气显示不清空 被动99 307 目标选择修改 2021-09-01 18:40:32 +08:00
gaoxin dec3a4d338 【资源】织女新立绘添加 2021-08-31 18:34:16 +08:00
gaoxin 6d2253347a 【icon】添加新的出包ICon 2021-08-31 15:42:25 +08:00
gaoxin 6e79e38b75 【包配置】修改专服包的母包功能 2021-08-31 15:26:22 +08:00
gaoxin 8a0b1c80a2 【战斗】被动添加时Log 2021-08-31 14:48:44 +08:00
gaoxin 4e8e552ca8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:29:46 +08:00
wangzhenxing 7eeebb014e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-31 14:26:02 +08:00
wangzhenxing 8c6c57d916 [战斗]=============被动263 269 274 332 112 145 修改提交 2021-08-31 14:25:43 +08:00
gaoxin 93413b3b07 【战斗】添加一些战斗日志 2021-08-31 14:25:29 +08:00
gaoxin c67c9fb93b 【战斗】修复战斗报错 2021-08-31 13:44:13 +08:00
jiaoyangna ba96d80208 四元阵特效修改提交
(cherry picked from commit 03b00d7762)
2021-08-31 10:54:39 +08:00
jiaoyangna 209bd7ed0c 四元阵特效修改提交
(cherry picked from commit f355940615)
2021-08-31 10:54:32 +08:00
ZhangBiao e68d6a2b23 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 18:45:31 +08:00
ZhangBiao 4e9ce855f2 【玩家神将信息界面】魂印本身战力不增加修改 2021-08-30 18:45:21 +08:00
gaoxin f0115a8e07 【数数】修复Android平台下IOS组件找不到的问题 2021-08-30 18:15:54 +08:00
ZhangBiao 1f2a21a587 【推荐工会】 2021-08-30 16:24:30 +08:00
ZhangBiao 78f4dccc1e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 15:37:22 +08:00
ZhangBiao f484e60f87 【工会推荐】搜索修改 2021-08-30 15:37:10 +08:00
gaoxin 2da3f4b8e5 【Logo】删除SDKConfig 2021-08-30 15:35:14 +08:00
ZhangBiao ca59c47cce Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-08-30 15:29:35 +08:00
ZhangBiao 671f3cfb28 【公会推荐】重复打开工会界面名称会重复修改 2021-08-30 15:29:22 +08:00
wangzhenxing 172f800d2e 【战斗】=============杨戬新技能特效提交 2021-08-30 14:14:48 +08:00