Commit Graph

3938 Commits (5a4742610af5424ddd90374a5161bbe0866ce27d)
 

Author SHA1 Message Date
gaoxin 5a4742610a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 16:12:51 +08:00
gaoxin 22536f7076 【本地化】限时召唤,按钮拉长,气泡随文字多少变化 2021-02-25 16:12:46 +08:00
jiaoyangna f25d5b7242 合成神将修改 2021-02-25 15:56:52 +08:00
jiaoyangna d2dbaec760 英雄合成提交 2021-02-25 15:46:27 +08:00
jiaoyangna 4c88ab3c39 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 15:41:44 +08:00
jiaoyangna 3a31425e5a 装备合成界面修改 2021-02-25 15:41:34 +08:00
gaoxin 2f59385c18 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 15:38:34 +08:00
gaoxin 7ea798b693 【本地化】部分活动介绍界面内容改为可滑动 2021-02-25 15:38:27 +08:00
jiaoyangna 46bc97fdeb 魂印界面修改提交 2021-02-25 15:36:46 +08:00
jiaoyangna 0e80a3ee5a 玩家信息界面修改 2021-02-25 15:28:08 +08:00
jiaoyangna ee5e5777f3 社稷大点, 活动任务提交 2021-02-25 15:20:49 +08:00
jiaoyangna db9f456676 没有翻译图片显示中文 2021-02-25 15:10:44 +08:00
jiaoyangna 7a0730fbe7 容错修改 2021-02-25 15:04:54 +08:00
jiaoyangna fc28bb9e35 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
2021-02-25 14:20:51 +08:00
jiaoyangna df38aea68e 巅峰赛修改 2021-02-25 14:20:29 +08:00
ZhangBiao b2dbdfe599 【本地化】page12 14 jumpview 2021-02-25 13:31:27 +08:00
ZhangBiao 9a54660c1f 【本地化】降妖夺宝 新将来袭 2021-02-25 11:24:43 +08:00
ZhangBiao 468731dc53 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 11:17:10 +08:00
ZhangBiao 1c52db19b6 【本地化】page 2 10 12 13 mainshop 2021-02-25 11:17:00 +08:00
jiaoyangna d14e8a8b31 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 10:41:13 +08:00
jiaoyangna e953005b6e 活动排行 灵兽抽卡 修改 2021-02-25 10:41:07 +08:00
ZhangBiao b15603c722 【本地化】 2021-02-25 10:17:24 +08:00
jiaoyangna 9cd02c5063 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 21:03:40 +08:00
jiaoyangna dd3e202ae3 图片提交 2021-02-24 21:03:36 +08:00
ZhangBiao 58d0b7874f 【本地化】 2021-02-24 20:57:28 +08:00
ZhangBiao 83306455e9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:56:28 +08:00
ZhangBiao 61b22edef5 【本地化】提交 2021-02-24 20:56:01 +08:00
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
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
jiaoyangna fd2626bfb1 青龙秘宝修改 2021-02-24 15:41:23 +08:00
jiaoyangna ab27a768cf 青龙秘宝修改 2021-02-24 15:37:17 +08:00