Commit Graph

4094 Commits (651f328f9580e1aed63f5fc384f458d8eb0f29b3)
 

Author SHA1 Message Date
jiaoyangna 10759be394 大闹天宫提交 2021-02-24 20:32:54 +08:00
jiaoyangna 19a743a74b Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:25:40 +08:00
jiaoyangna dc68abaf55 大闹天宫 2021-02-24 20:25:29 +08:00
ZhangBiao 180ad3ab31 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:25:08 +08:00
ZhangBiao 5834e08ee2 【本地化】提交 2021-02-24 20:24:58 +08:00
jiaoyangna b6f00fd4e8 车迟提交 2021-02-24 19:55:50 +08:00
zhangqiang 39d43b11bc 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变2 2021-02-24 19:48:04 +08:00
jiaoyangna affb12060a 心魔 修改提交 2021-02-24 18:27:53 +08:00
jiaoyangna ba8c822b3f Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 18:23:50 +08:00
jiaoyangna a34bd942bf 极速探索提交 2021-02-24 18:23:40 +08:00
ZhangBiao 42d6c9e8b9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 18:17:54 +08:00
ZhangBiao f8bc361605 【本地化】首充 四元阵 2021-02-24 18:17:46 +08:00
jiaoyangna d403acaf58 等级礼包修改提交 2021-02-24 18:13:55 +08:00
jiaoyangna e9d02d8006 天尊降世修改 2021-02-24 18:07:44 +08:00
jiaoyangna ee8a721624 灵兽抽卡修改 2021-02-24 18:00:19 +08:00
jiaoyangna da35c73296 灵兽分解修改 2021-02-24 17:48:35 +08:00
jiaoyangna 661b191fa9 驭兽斋抽卡无响应 2021-02-24 17:45:48 +08:00
jiaoyangna 48c959e302 森罗左下角修改 2021-02-24 17:40:35 +08:00
jiaoyangna e52b646c3a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 17:38:12 +08:00
jiaoyangna e42193d264 轩辕,森罗修改 2021-02-24 17:37:56 +08:00
ZhangBiao 5c5704cdf1 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 17:36:35 +08:00
ZhangBiao 16a4fa4dde 【本地化】灵兽界面 福利界面 2021-02-24 17:36:24 +08:00
gaoxin bb68af637a 【战斗】修复孙悟空和观音菩萨同时死亡导致报错的问题 2021-02-24 17:02:31 +08:00
zhangqiang d454c3bf08 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变 2021-02-24 16:47:20 +08:00
jiaoyangna fd2626bfb1 青龙秘宝修改 2021-02-24 15:41:23 +08:00
jiaoyangna ab27a768cf 青龙秘宝修改 2021-02-24 15:37:17 +08:00
jiaoyangna 4b05af8b04 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 15:14:12 +08:00
jiaoyangna d65037420c 排行榜提交 2021-02-24 15:13:57 +08:00
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
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