Commit Graph

4343 Commits (1a6700d3a8114cb38f1fec6b8b899dcc4d7b4c28)
 

Author SHA1 Message Date
gaoxin 6b128d46ef Merge branch 'xma/dev_temp' into xma/dev 2021-02-24 15:08:38 +08:00
jiaoyangna 541b45e6ea 排行榜提交 2021-02-24 15:07:31 +08:00
JieLing 87f5e271e3 【ScrollCycleView】修改2 2021-02-24 15:01:52 +08:00
JieLing cf0e819d73 【优化】scrollview SetData接口默认回到顶部 2021-02-24 14:56:01 +08:00
JieLing 1b77aec298 【bug】修复scrollview修改导致引导报错的问题 2021-02-24 14:53:59 +08:00
jiaoyangna aae09643f0 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 14:52:28 +08:00
jiaoyangna 08cafc0ce9 限时活动,活动排行 修改 2021-02-24 14:52:18 +08:00
ZhangBiao 1d7f5572cb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 14:45:16 +08:00
ZhangBiao 10e8da678a 【本地化】天宫寻宝相关修改 2021-02-24 14:45:09 +08:00
gaoxin 4b4049e938 【scrollCycleView】 修改1 2021-02-24 14:32:03 +08:00
jiaoyangna af1bb0eb78 礼包抢购 积天豪礼 修改 2021-02-24 14:04:32 +08:00
gaoxin cd4a1e8c89 配置文件结构修改 2021-02-24 13:53:11 +08:00
jiaoyangna 0e1495adcb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 12:04:49 +08:00
jiaoyangna 5088768f6c 探宝修改 2021-02-24 12:04:39 +08:00
jiaoyangna abf4322b79 幸运探宝修改 2021-02-24 12:02:36 +08:00
ZhangBiao 7338db75ad Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 11:47:15 +08:00
ZhangBiao fc7879a56a 【本地化】我要变强 首充 2021-02-24 11:47:07 +08:00
jiaoyangna d7bee8c711 十绝阵奖励修改 2021-02-24 11:46:07 +08:00
jiaoyangna 73e973824d vip 提交 2021-02-24 11:39:00 +08:00
jiaoyangna a98be3b0ef Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 11:26:38 +08:00
jiaoyangna 91904aef1e 提交language.txt 2021-02-24 11:26:26 +08:00
ZhangBiao f3e44753e2 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 11:24:01 +08:00
ZhangBiao 74185b0d1b 【本地化】 2021-02-24 11:23:53 +08:00
jiaoyangna 4445f509af 四灵修改提交 2021-02-24 11:22:41 +08:00
jiaoyangna 5acf0b2ed2 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 11:15:21 +08:00
jiaoyangna 45a4b740d2 红包修改提交 2021-02-24 11:15:03 +08:00
gaoxin 23fa451553 【gm】方法名重复 2021-02-24 11:11:53 +08:00
zhangqiang ac3fe3f251 【升星界面调整】9升10星,十星位置需调整 2021-02-24 10:53:21 +08:00
jiaoyangna 22dcb8c487 公会红包修改 2021-02-24 10:44:00 +08:00
jiaoyangna 6a0dc005eb 公会技能重置修改 2021-02-24 10:23:15 +08:00
jiaoyangna fc75b356b0 公会修改 2021-02-24 10:21:44 +08:00
zhangqiang dc42a492e7 【排行榜优化】排行榜信息分页读取 2021-02-24 10:13:43 +08:00
ZhangBiao 8e0b99ba8b Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 10:04:36 +08:00
ZhangBiao 29aa15c12f 【本地化】灵兽界面调整 2021-02-24 10:04:28 +08:00
jiaoyangna de3cc09086 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 09:54:25 +08:00
jiaoyangna 71c86423ac 十绝阵提交 2021-02-24 09:54:21 +08:00
ZhangBiao 91f46cb250 【本地化】森罗幻境修改 2021-02-24 09:48:22 +08:00
ZhangBiao b9d35e4671 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-23 20:57:35 +08:00
ZhangBiao f98e81bb37 【本地化】无尽副本界面左上右上调整 2021-02-23 20:57:26 +08:00
zhangqiang 497729e762 【优化】查找合成的时候英雄名字查找困难 英雄名字放在主页上 2021-02-23 20:50:56 +08:00
jiaoyangna 576400a914 公会商店本地化修改提交 2021-02-23 20:50:34 +08:00
zhangqiang f7d62a72fc 恭喜获得界面中,道具名称过长的情况,改为显示4个字+省略号的形式显示,参考背包即可 2021-02-23 20:37:57 +08:00
jiaoyangna 59af047cd9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-23 20:18:32 +08:00
jiaoyangna f5450e201d 公会提交 2021-02-23 20:18:25 +08:00
ZhangBiao 82db5c4b57 【本地化】排行榜修改 2021-02-23 20:13:59 +08:00
gaoxin 169ad402c7 【本地化】修复白片得问题 2021-02-23 19:12:16 +08:00
ZhangBiao 1c77912e61 【本地化】开服狂欢修改 2021-02-23 18:15:15 +08:00
ZhangBiao 543e0b7b22 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-23 17:43:08 +08:00
ZhangBiao 5d1b8bf9b9 【本地化】界面挑战 2021-02-23 17:41:59 +08:00
jiaoyangna 7fbcd27b69 日常任务界面页签修改 2021-02-23 17:41:50 +08:00