Commit Graph

4104 Commits (3095b8af1818d04c097219ee0fd1baed7149443c)
 

Author SHA1 Message Date
gaoxin 5fee9ee759 【bug】修复领取奖励报错的问题 2021-02-26 14:39:25 +08:00
gaoxin 6f250d9cf8 Merge commit '545dee3df1a4d839d2fe75bf891082aa4b07baec' into 0功能/周版本优化0303
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalManager.lua
2021-02-26 14:38:23 +08:00
jiaoyangna 84ae606ee9 限时召唤白片提交 2021-02-26 13:47:04 +08:00
jiaoyangna 8753e784ec 图片提交 2021-02-26 13:44:50 +08:00
liujiaqi 866fd6c3fc 【资源】越南语临时资源替换 2021-02-26 11:23:02 +08:00
jiaoyangna 9f05f94439 本地化 2021-02-26 10:53:37 +08:00
zhangqiang 545dee3df1 【ScrollCycleView】修改4 2021-02-26 10:37:39 +08:00
jiaoyangna 3f38b704be 已修改 2021-02-26 10:32:02 +08:00
gaoxin edec649f64 【bug】修复合成时log信息导致的报错 2021-02-26 10:13:27 +08:00
gaoxin 584431db2e 【bug】修复新将战斗跳过回到新将界面还会播放战斗音效的问题 2021-02-26 10:08:36 +08:00
jiaoyangna c235f6df6a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-26 09:59:06 +08:00
jiaoyangna b93f69cfa6 文字导出 2021-02-26 09:59:01 +08:00
gaoxin 395d776dec Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 21:51:14 +08:00
gaoxin daba5a7d0e 【本地化】工具再调整 2021-02-25 21:50:56 +08:00
jiaoyangna f08477cbd6 积分礼包领不了 2021-02-25 21:45:52 +08:00
jiaoyangna 6bf391f175 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 21:43:03 +08:00
gaoxin db1cd07e4f Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 21:42:38 +08:00
jiaoyangna bacf88be86 日志,本地化修改 2021-02-25 21:42:38 +08:00
gaoxin 7f8fb4aef3 【本地化】语言工具调整 2021-02-25 21:42:33 +08:00
gaoxin 2f22ac850a 【本地化】资源导入调整 2021-02-25 21:40:05 +08:00
wangzhenxing 0e23ca3cf8 [战斗]======= 2021-0303发布计划 战斗修改 2021-02-25 19:48:24 +09:00
jiaoyangna e46d735134 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 18:36:55 +08:00
jiaoyangna 69a2253d12 装备提交 2021-02-25 18:36:50 +08:00
gaoxin 20622e5e62 【本地化】文字自适应大小并自动换行 2021-02-25 17:46:32 +08:00
gaoxin c6430f59a5 【本地化】乾坤宝盒界面相关修改 2021-02-25 17:31:26 +08:00
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
gaoxin 9c15d51669 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-25 14:33:27 +08:00
gaoxin 0babcc640b 【报警】添加用于确认登录成功的接口,后端用于登录监测告警 2021-02-25 14:33:23 +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
jiaoyangna c3c1f6abf9 去掉颜色显隐 2021-02-25 14:19:45 +08:00
jiaoyangna fe881897dc Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-25 13:47:09 +08:00
jiaoyangna e709c80428 竞技场修改 2021-02-25 13:47:04 +08:00
ZhangBiao b2dbdfe599 【本地化】page12 14 jumpview 2021-02-25 13:31:27 +08:00
zhangqiang 5699b89258 【ScrollCycleView】修改3 2021-02-25 12:04:31 +08:00
zhangqiang 67d0dfa44f 【抽卡奖池】显示问题 2021-02-25 12:00: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