Commit Graph

4080 Commits (d5076fde3ce061bc4bb2ef910b994c6cabe4a71b)
 

Author SHA1 Message Date
zhangqiang e3bae7a821 提交 2021-02-27 16:52:00 +08:00
zhangqiang 1604821615 【ScrollCycleView】修改5 2021-02-27 16:51:55 +08:00
zhangqiang 8e9c439623 【越南语】修改 2021-02-27 16:36:05 +08:00
zhangqiang 9739ff3090 【越南语】修改 2021-02-27 16:21:23 +08:00
gaoxin 020c73c498 【本地化】导出预设新增文本 2021-02-27 16:20:10 +08:00
gaoxin bca617284b 【本地化】重置选择神将界面文字超框显示修改 2021-02-27 15:52:11 +08:00
zhangqiang 7a7196f93a 【越南语】修改 2021-02-27 15:42:50 +08:00
gaoxin ae39622310 【本地化】充值界面文字显示错乱修改 2021-02-27 15:22:24 +08:00
gaoxin ff9199d7c9 【本地化】修复充值界面礼包按钮资源错误 2021-02-27 14:55:53 +08:00
gaoxin b3ba0826d9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-27 14:51:19 +08:00
gaoxin d575bd1313 【本地化】升级,最大星级白片修改 2021-02-27 14:51:14 +08:00
zhangqiang efd3ab9216 【越南包】问题修改 2021-02-27 14:47:57 +08:00
gaoxin 570352ea2c 【本地化】鸿蒙阵按钮资源修改,三界降魔按钮文字资源 2021-02-27 14:34:36 +08:00
gaoxin b72a502a9f 【本地化】不在播放闪屏 2021-02-26 17:58:10 +08:00
liujiaqi 59cfcff035 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-26 17:26:39 +08:00
liujiaqi 8a00efca60 共鸣 英雄界面 提交 2021-02-26 17:26:17 +08:00
wangzhenxing 0bd2c53e6c 【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻 2021-02-26 18:19:54 +09:00
JieLing 42e5fee545 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-26 17:17:00 +08:00
JieLing 619b3d9983 【本地化】挂机界面优化 2021-02-26 17:16:37 +08:00
liujiaqi c7c98679a7 【资源】文件名修正 2021-02-26 17:13:18 +08:00
JieLing b5cb873806 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/c_ccfy_banner01_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/d_danxinbixue_banner2_zh.jpg.meta
2021-02-26 16:13:08 +08:00
JieLing 48039cc7a3 【本地化】冗余资源删除 2021-02-26 16:06:18 +08:00
wangzhenxing 7ae746b318 [战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻 2021-02-26 17:00:05 +09:00
gaoxin 2eb23e406b 【本地化】修复月卡界面英文显示错误 2021-02-26 15:52:35 +08:00
gaoxin 16486a13b5 【本地化】添加按比例缩小文字的方法 2021-02-26 15:37:50 +08:00
gaoxin 639602c6ac 【导表工具】关闭老工具显示 2021-02-26 14:39:34 +08:00
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