Commit Graph

3836 Commits (d00236d6d0c00f575ea23284a462421942aa2018)

Author SHA1 Message Date
jiaoyangna 292069ba5d 活动提交 2021-03-11 10:59:49 +08:00
ZhangBiao 4631f663a8 【本地化】魂灵宝处需要修改 2021-03-11 10:41:34 +08:00
ZhangBiao fbe4e36c95 【鸿蒙阵】加速冷却,妖精不足时提示不足,领取妖精后依然提示不足,重登正常 2021-03-11 10:21:48 +08:00
zhangqiang 53e0bc02a1 【资源导入】0001头像立绘 2021-03-11 09:40:12 +08:00
ZhangBiao 867dcf5007 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-10 18:35:38 +08:00
ZhangBiao 884abb765d 【车迟斗法】修改 2021-03-10 18:35:14 +08:00
zhangqiang a0e14a4126 【卡牌资源】提交 2021-03-10 18:20:37 +08:00
gaoxin 2e6cfc3232 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-10 18:11:32 +08:00
gaoxin 17a9108b01 【网络】修复断开连接接口参数错误 2021-03-10 18:11:27 +08:00
ZhangBiao 4a3b79fce7 【锻器阁】添加材料图标不对称 2021-03-10 17:57:19 +08:00
zhangqiang d8e37cdc66 【大闹天宫前端合并修改提交】 2021-03-10 17:44:56 +08:00
zhangqiang 88d1464fb3 【大闹天宫前端修改提交】 2021-03-10 17:42:17 +08:00
zhangqiang 0ba3ebb44d 【大闹天宫修改】前端圣物战力 商店节点加妖晶显示 2021-03-10 17:33:13 +08:00
ZhangBiao 4fe58e9145 【鸿蒙阵】删了空行 bug没复现 2021-03-10 17:29:31 +08:00
gaoxin 06f54f15b3 【配置】兼容老包 2021-03-10 14:56:53 +08:00
jiaoyangna 4121f24a27 Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
2021-03-10 13:50:38 +08:00
gaoxin 3daf6a11b3 【本地化】青龙秘宝活动时间显示优化 2021-03-10 11:19:20 +08:00
gaoxin e3bc4ecfe0 【本地化】修复升级重复显示lv文字 2021-03-10 11:04:46 +08:00
wangzhenxing ca62c6f377 Merge branch '0功能/本周版本优化内容_battle' into 0功能/本周版本优化内容 2021-03-10 10:30:47 +08:00
gaoxin e725a887a9 【bug】修复公告界面显示错误 2021-03-09 18:31:19 +08:00
ZhangBiao 03de42eb51 【首领来袭】判断关卡类型 2021-03-09 17:19:00 +08:00
wangzhenxing 1b64251cbd Merge branch '0功能/本周版本优化内容' into 0功能/本周版本优化内容_battle 2021-03-09 17:13:33 +08:00
JieLing f0a85ff774 【hotfix】打包配置提交 2021-03-09 16:05:33 +08:00
JieLing abd4028923 【meta】打包后meta文件上传 2021-03-09 16:04:18 +08:00
wangzhenxing a2b96970cc 【战斗】=========打闹天宫获取英雄模板数据修改,改为全从 heroconfig 表获取 2021-03-09 15:48:28 +08:00
gaoxin 9aa87b54e2 【本地化】资源替换 2021-03-09 15:44:44 +08:00
gaoxin 460479779e Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-09 15:39:46 +08:00
gaoxin 13fbabf125 【bug】修复老包中文字重叠 2021-03-09 15:39:42 +08:00
ZhangBiao cdc8d468cb 【灵兽界面】文字问题 2021-03-09 15:34:29 +08:00
gaoxin d2940b5a18 【bug】修复排行榜分页 数据刷新后会导致页面回到最上方 2021-03-09 15:18:27 +08:00
gaoxin 141e60d493 【本地化】修复灵兽装备按钮默认显示英文的问题 2021-03-09 15:00:59 +08:00
jiaoyangna 5bd35da17c Revert "图片整理提交"
This reverts commit 988b881285.
2021-03-09 14:37:14 +08:00
jiaoyangna 0b5afbc4ea Revert "删除 有_zh的图片的 没有加后缀的 图片"
This reverts commit 72998061d8.
2021-03-09 14:36:27 +08:00
jiaoyangna 64062ba3cf Revert "图片提交"
This reverts commit 6418f1280d.
2021-03-09 14:36:20 +08:00
jiaoyangna 6418f1280d 图片提交 2021-03-09 14:18:15 +08:00
jiaoyangna 72998061d8 删除 有_zh的图片的 没有加后缀的 图片 2021-03-09 14:08:19 +08:00
jiaoyangna 988b881285 图片整理提交 2021-03-09 12:44:53 +08:00
JieLing 5eef06e043 【bug】修复老包报错 2021-03-08 22:33:04 +08:00
JieLing 4cac839360 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-08 22:17:15 +08:00
JieLing 5d149e54fa 【bug】修复老包报错 2021-03-08 22:17:00 +08:00
ZhangBiao ce7a9abe08 【大闹天宫】招募节点回滚 2021-03-08 20:40:55 +08:00
gaoxin 88c5fa7a02 【本地化】老包设置界面删除多余显示 2021-03-08 18:20:47 +08:00
wangzhenxing b67d6485c9 [战斗]==============249修改 2021-03-08 18:07:13 +08:00
gaoxin 097d754111 【本地化】新增资源 2021-03-08 17:27:45 +08:00
gaoxin 6d7c2c0a25 【本地化】图片资源压缩 2021-03-08 16:53:16 +08:00
gaoxin 766ba304ed 【本地化】法宝回收提示文本翻译,神将装备界面对比套装属性翻译,轩辕宝镜充值界面文本显示调整 2021-03-08 16:51:13 +08:00
gaoxin c67d5d4d3f 【bug】修复本地化导致其他语言支付不成功 2021-03-08 16:19:12 +08:00
gaoxin 2838044ac5 【本地化】鸿蒙阵提示界面显示修改 2021-03-08 16:16:27 +08:00
gaoxin 12ecb9f437 【本地化】修复老包找不到Configmgr报错 2021-03-08 11:23:00 +08:00
ZhangBiao 42547ff956 【本地化】八日登陆**问题解决 2021-03-08 11:06:07 +08:00
ZhangBiao da0b2d010a 【本地化】签到宝箱下移 2021-03-08 11:00:33 +08:00
ZhangBiao 33d6f64785 【本地化】鸿蒙阵结果中文修改 2021-03-08 10:57:57 +08:00
gaoxin 81a10ad759 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 22:35:42 +08:00
gaoxin 62c03bfebf 【本地化】热更新提示框文字超出显示范围 2021-03-07 22:35:37 +08:00
gaoxin 0e62748aff Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 21:22:36 +08:00
gaoxin 7662a5b154 【本地化】灵兽技能文字左移 2021-03-07 21:22:23 +08:00
gaoxin 96086a40a4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 20:48:17 +08:00
gaoxin 22dbfc310c 【本地化】我要变强推荐阵容显示修改,热更大小保留小数点后两位,十绝阵奖励显示修改 2021-03-07 20:48:05 +08:00
jiaoyangna f5a1514674 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 20:42:55 +08:00
jiaoyangna 8431c1eb69 商店修改 2021-03-07 20:41:33 +08:00
gaoxin 0a251132e0 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 19:32:10 +08:00
gaoxin b82352796e 【本地化】鸿蒙阵修复文字重叠 2021-03-07 19:14:30 +08:00
gaoxin 25af0a837a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 19:06:17 +08:00
gaoxin bbca0ca426 【本地化】装备切换界面套装属性翻译,成就提示文字超框显示修改 2021-03-07 19:06:13 +08:00
gaoxin e874afa2ea 【本地化】十绝阵结算还是会重叠 2021-03-07 18:00:12 +08:00
gaoxin 76d4d549e8 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 17:54:51 +08:00
gaoxin 4e93380a99 【本地化】法宝升级界面文字重叠 2021-03-07 17:54:46 +08:00
jiaoyangna 17b6ae35b1 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 17:52:27 +08:00
jiaoyangna c86865b3dd 装备提交 2021-03-07 17:52:23 +08:00
gaoxin 89ff803da0 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 17:43:12 +08:00
gaoxin f8dc9552c9 【本地化】十绝阵结算伤害文字重叠 2021-03-07 17:43:04 +08:00
DESKTOP-98AVA47\Administrator 270b53cab1 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 17:36:23 +08:00
gaoxin fb8637c613 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 17:31:43 +08:00
gaoxin 9156962e89 【本地化】限时召唤英雄名称显示不全 2021-03-07 17:31:25 +08:00
jiaoyangna 594ce2b53a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab
2021-03-07 17:17:47 +08:00
jiaoyangna bba9bf2b37 本地化提交 2021-03-07 17:17:23 +08:00
gaoxin 71bd8865fd 【本地化】青龙秘宝超框,成就完成提示超框 2021-03-07 17:15:33 +08:00
jiaoyangna e02c48df84 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 17:00:55 +08:00
jiaoyangna 6d985b13e2 本地化 2021-03-07 17:00:50 +08:00
gaoxin 52a2b6ca63 【本地化】魂印分解界面文字重合修复 2021-03-07 17:00:15 +08:00
gaoxin 7c8cf16c98 【bug】修复图鉴界面打开报错 2021-03-07 16:43:07 +08:00
jiaoyangna d62263859c 【本地化】竞技场界面时间修改 2021-03-07 16:28:45 +08:00
gaoxin ea8c1a9e7d 【适配】热更界面屏幕适配修改 2021-03-07 16:20:11 +08:00
gaoxin 3175ef5eb2 【适配】鸿蒙阵屏幕适配修改 2021-03-07 16:19:53 +08:00
gaoxin 022444dffa 【bug】修复副本界面在全面屏下ui变小的问题 2021-03-07 15:46:19 +08:00
gaoxin 05c66c280a 【本地化】资源回滚 2021-03-07 15:41:26 +08:00
gaoxin b8762232bc 【本地化】登录界面logo替换,不再扫光 2021-03-07 15:33:41 +08:00
jiaoyangna 64d267b232 乾坤宝盒时间调整 2021-03-07 15:32:28 +08:00
jiaoyangna 21a607b7c4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 15:16:47 +08:00
jiaoyangna 99dcf2ed40 灵兽等级显示错误修改 2021-03-07 15:16:40 +08:00
gaoxin ac312d9227 【本地化】关闭一些界面显示 2021-03-07 14:58:16 +08:00
gaoxin 906c44ae95 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-07 14:57:12 +08:00
gaoxin 7490911418 【本地化】修改文本位置 2021-03-07 14:57:07 +08:00
jiaoyangna 6878db8818 限时招募提交 2021-03-07 14:40:48 +08:00
jiaoyangna 0b975da446 限时招募提交 2021-03-07 14:16:58 +08:00
zhangqiang 02821bf9d6 【本地化】 2021-03-05 18:35:32 +08:00
jiaoyangna cdd2ec63f6 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 18:34:04 +08:00
jiaoyangna bf45224c5f 升级修改提交 2021-03-05 18:33:46 +08:00
gaoxin b8af05773d 【本地化】竞技场编队文字修改 2021-03-05 18:18:22 +08:00
zhangqiang a9d251494c 【本地化】 2021-03-05 17:59:38 +08:00
ZhangBiao 9792e57e9b 【系统弹窗】提交 2021-03-05 17:27:57 +08:00
gaoxin cb219de48a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 17:19:36 +08:00
gaoxin 1a54f29a6d 【本地化】修复鸿蒙碑指引超出屏幕范围 2021-03-05 17:19:21 +08:00
zhangqiang e9bd743af5 【本地化】 2021-03-05 17:18:07 +08:00
gaoxin 9ca66e9f40 【本地化】修复魂印选择名字重叠 2021-03-05 17:07:59 +08:00
wangzhenxing 130a7d6548 [战斗]=============272被动修改 根据配置回合数开始计算概率 2021-03-05 18:02:31 +09:00
gaoxin f11127e3cc 【本地化】限时礼包预设漏提交,成就文字过长修改 2021-03-05 16:57:48 +08:00
gaoxin 6b6fd062c8 【本地化】战斗统计部分效果添加翻译 2021-03-05 16:56:27 +08:00
gaoxin 1e784087c9 【本地化】限时礼包限购提示文字本地化修改 2021-03-05 16:41:59 +08:00
zhangqiang ea3ad6d934 【本地化】 2021-03-05 16:26:39 +08:00
jiaoyangna 1937e33d8e Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Expert/PatFacePanel.prefab
2021-03-05 16:07:20 +08:00
jiaoyangna 91f1fefe1a 本地化提交 2021-03-05 16:06:51 +08:00
zhangqiang 9f1b0aa44b 【本地化】 2021-03-05 15:55:54 +08:00
gaoxin 63b4a7e32c Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:42:22 +08:00
gaoxin c512fdbcff 【本地化】图片资源名反了 2021-03-05 15:42:17 +08:00
wangzhenxing 74ebe19f74 [战斗]====================大闹天宫圣物修改提交 2021-03-05 16:26:50 +09:00
ZhangBiao 8ad9913800 【本地化】我要变强修改 2021-03-05 15:24:43 +08:00
ZhangBiao 16982ef939 提交 2021-03-05 15:19:47 +08:00
ZhangBiao 11ee456279 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:14:32 +08:00
ZhangBiao 3c32b2aa4a 【本地化】我要变强 灵兽lv修改 2021-03-05 15:14:22 +08:00
zhangqiang 0af293c7d9 【巅峰赛 部分】 2021-03-05 15:12:15 +08:00
gaoxin 2cf5293192 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:04:27 +08:00
gaoxin a8052da594 【本地化】优化战斗内文字显示 2021-03-05 15:04:14 +08:00
jiaoyangna 9a687232c9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 15:02:33 +08:00
jiaoyangna 9cfbc69d17 限时活动红点不消失修改 2021-03-05 15:02:29 +08:00
gaoxin 0dcbc50496 【本地化】战斗内字体修改 2021-03-05 14:55:44 +08:00
gaoxin 99e373bda2 【协议】修复登录成功确认协议丢失 2021-03-05 14:53:03 +08:00
gaoxin c97b14319c 【本地化】随即名字本地化处理 2021-03-05 14:43:27 +08:00
ZhangBiao eaac0b6cd1 Revert "【本地化】随机名字本地化"
This reverts commit 8dadc2d54b.
2021-03-05 14:36:19 +08:00
ZhangBiao 38d5687359 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 14:32:40 +08:00
ZhangBiao 8dadc2d54b 【本地化】随机名字本地化 2021-03-05 14:32:29 +08:00
zhangqiang 5c641ef598 【灵兽主界面等级 + 升级成功】 2021-03-05 14:13:13 +08:00
jiaoyangna d1f18c39b3 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-05 14:01:03 +08:00
jiaoyangna 7c5fd4408e 本地化提交 2021-03-05 14:00:45 +08:00
ZhangBiao 005e54b036 【大闹天宫】招募节点修改 2021-03-05 13:54:19 +08:00
zhangqiang fec790a1e0 【宝物强化】 2021-03-05 13:54:08 +08:00
zhangqiang a0f81de2ce 灵兽最大等级白片 2021-03-05 12:15:39 +08:00
jiaoyangna 6a777d71c6 十绝阵文字重叠提交 2021-03-05 11:58:29 +08:00
jiaoyangna 28582fb4f6 本地化 2021-03-05 11:51:30 +08:00
jiaoyangna 37e5733d1a 本地化 2021-03-05 11:45:42 +08:00
zhangqiang 1364517cfb 修改 2021-03-05 11:27:28 +08:00
ZhangBiao 9ef30f18bb 【首领来袭】报错修改 2021-03-05 11:00:38 +08:00
jiaoyangna 32618d66bf 神衣天降修改 2021-03-05 09:57:11 +08:00
zhangqiang fe8da6eada 【限时活动】 2021-03-04 23:14:42 +08:00
zhangqiang 1cfa70da67 【主题活动】 2021-03-04 22:56:51 +08:00
zhangqiang 7770865a40 【主题活动修改】 2021-03-04 22:15:24 +08:00
jiaoyangna 1acfbabcde Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 21:33:24 +08:00
jiaoyangna 29f1ae90e0 预设提交 2021-03-04 21:33:19 +08:00
zhangqiang d249f78e8f 【灵兽特惠】 2021-03-04 21:22:02 +08:00
gaoxin 30083c2449 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 21:01:26 +08:00
gaoxin 7198279fcc 【bug】修复ScrollCycleView回收导致报错的问题 2021-03-04 21:01:21 +08:00
zhangqiang e97fd92b92 【乾坤宝盒单抽卡死】 2021-03-04 20:35:21 +08:00
zhangqiang a29e0db487 【主题活动】 2021-03-04 20:18:37 +08:00
jiaoyangna 21e0998228 图片提交 2021-03-04 20:17:22 +08:00
gaoxin 099c0603bb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 19:59:36 +08:00
zhangqiang 0f25668d0f 【1008主题活动修改】 2021-03-04 19:50:26 +08:00
gaoxin a578651df9 Merge branch 'xma/dev_temp' into xma/dev 2021-03-04 19:49:17 +08:00
gaoxin 1c210301fd 【本地化】后端写死文本改为表配置 2021-03-04 19:48:38 +08:00
gaoxin d3a1cba41c 【管理】包配置管理加入 2021-03-04 19:29:15 +08:00
zhangqiang c54e899684 【live2d导入】0025 2021-03-04 19:20:08 +08:00
jiaoyangna ba7a5fbb18 本地化提交 2021-03-04 19:04:33 +08:00
zhangqiang 0b9394188a 【修改 2021-03-04 19:03:09 +08:00
guowei e7b2eb579e 【需求】 鸿蒙阵道具数量优化 2021-03-04 18:27:31 +08:00
zhangqiang f3fba14341 【点金排行榜】 2021-03-04 17:37:53 +08:00
jiaoyangna 8325cf0537 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 17:02:04 +08:00
jiaoyangna 09870ee552 除了中文其他语言不播音效 2021-03-04 17:02:00 +08:00
zhangqiang 3d9d5b0ed3 【20201001主题】 2021-03-04 16:58:28 +08:00
gaoxin 999e8e8cf4 Merge branch 'xma/dev' into xma/dev_temp 2021-03-04 16:51:55 +08:00
gaoxin 6f4a793bc5 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 16:47:57 +08:00
gaoxin abad647f16 【本地化】新增资源导入 2021-03-04 16:47:35 +08:00
gaoxin 265fb5684e 删除奇怪的资源文件 2021-03-04 16:44:55 +08:00
gaoxin 999010d8ca 冗余资源删除 2021-03-04 16:44:49 +08:00
gaoxin d31b9298df 【本地化】lua文本重新导出 2021-03-04 16:44:37 +08:00
jiaoyangna 0991575155 提示修改 2021-03-04 16:43:47 +08:00
jiaoyangna 7a6808a8d1 图片提交 2021-03-04 16:05:43 +08:00
zhangqiang 4fadb8e763 【新live2d导入】缺0025 2021-03-04 15:56:29 +08:00
zhangqiang 249cddb935 【显示兑换】 2021-03-04 15:18:31 +08:00
zhangqiang 6bbb1c7671 Revert "【新live2】导入 缺25"
This reverts commit 7d8145a3b9.
2021-03-04 15:16:46 +08:00
zhangqiang 86fd6724c1 【圣物选择】 2021-03-04 14:58:41 +08:00
jiaoyangna b3af8709ae 巅峰赛帮助文本修改 2021-03-04 14:28:46 +08:00
gaoxin 7d2a90fd90 Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
#	AssetBundles/version.txt
2021-03-04 13:47:59 +08:00
zhangqiang 7d8145a3b9 【新live2】导入 缺25 2021-03-04 11:44:19 +08:00
ZhangBiao 052767a836 【本地化】鸿蒙阵修改 2021-03-04 11:05:19 +08:00
ZhangBiao 7805c09f4d Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 10:16:42 +08:00
ZhangBiao 7d678094a3 【本地化】 2021-03-04 10:16:31 +08:00
jiaoyangna 90a87ee396 本地化 提交 2021-03-04 10:16:07 +08:00
ZhangBiao a7e578eea8 【本地化】 2021-03-03 18:31:18 +08:00
ZhangBiao 4861711fbc 【本地化】 2021-03-03 18:25:34 +08:00
ZhangBiao 37dcb0d6ad Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 18:07:38 +08:00
ZhangBiao c7ab8fcb8b 【本地化】 2021-03-03 18:07:29 +08:00
jiaoyangna ef65fb91f4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 17:46:19 +08:00
jiaoyangna cf5300bab2 图片提交 2021-03-03 17:46:08 +08:00
zhangqiang 1e1c325229 【神将】 2021-03-03 17:45:34 +08:00
ZhangBiao f01cdd582e Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 17:04:26 +08:00
ZhangBiao 6fe7b9ed28 【本地化】 2021-03-03 17:04:17 +08:00
zhangqiang 1ffe352007 【灵兽】 2021-03-03 16:59:52 +08:00
jiaoyangna 3095b8af18 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab
2021-03-03 16:28:47 +08:00
jiaoyangna d429d11d29 图片提交 2021-03-03 16:26:10 +08:00
zhangqiang 59c2caaede 【送神祠本地化修改】 2021-03-03 15:51:04 +08:00
ZhangBiao 09b534b44f 【本地化】 2021-03-03 15:36:17 +08:00
jiaoyangna ac5968285c Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 14:19:38 +08:00
jiaoyangna c6f716f1ba 主城修改 2021-03-03 14:19:34 +08:00
zhangqiang bbb7a48e07 福利 2021-03-03 14:15:18 +08:00
jiaoyangna 4e90f04c9d Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 12:01:21 +08:00
jiaoyangna 651f328f95 服务器列表 提交 2021-03-03 12:01:17 +08:00
ZhangBiao caaf50cf91 【本地化】 2021-03-03 11:30:06 +08:00
ZhangBiao ff70c8d635 【本地化】竞技场 积天豪礼 2021-03-03 10:07:13 +08:00
jiaoyangna 0851e8e1b8 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 21:06:46 +08:00
jiaoyangna ea6e1f242c 灵兽界面修改提交 2021-03-02 21:06:42 +08:00
ZhangBiao ecd67f5fa5 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 19:58:14 +08:00
ZhangBiao e9e18121d2 【本地化】逍遥游 2021-03-02 19:58:05 +08:00
jiaoyangna b4da5effa6 白片修改提交 2021-03-02 18:29:15 +08:00
ZhangBiao 439df6f2c9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 18:23:25 +08:00
ZhangBiao 1d2e611522 【本地化】森罗任务已完成白片 2021-03-02 18:23:18 +08:00
jiaoyangna 55e120a77b 竞技守卫 2021-03-02 18:08:27 +08:00
jiaoyangna 22b64d085d Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 18:05:10 +08:00
jiaoyangna f7a06a5783 竞技守卫修改 2021-03-02 18:05:06 +08:00
ZhangBiao eee28b7a6c 【本地化】 2021-03-02 17:45:04 +08:00
jiaoyangna 45c90098b2 预设提交 2021-03-02 17:11:00 +08:00
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna d5076fde3c Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 16:44:43 +08:00
jiaoyangna bdb47125a6 Merge branch 'local_to_dev' into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
#	Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua
#	FontArt/ArtFont_zh/hongmengzhen_zh.png
#	FontArt/ArtFont_zh/jianmushenshu_zh.png
#	FontArt/ArtFont_zh/silingshilian_zh.png
2021-03-02 16:44:38 +08:00
ZhangBiao be6b55ce43 【两个备份预设提交】 2021-03-02 16:11:15 +08:00
jiaoyangna fcc02e4875 lua 提交 2021-03-02 15:59:29 +08:00
gaoxin 00bbbea7e9 【网络重连】重连时间超过2分钟强制回到登录界面 2021-03-02 15:58:17 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
ZhangBiao b37d9625a9 【本地化】副本无法进入修复 2021-03-02 15:36:34 +08:00
ZhangBiao f643a1d279 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 15:23:03 +08:00
ZhangBiao f36126d291 【本地化】雷震子技能百篇 2021-03-02 15:22:51 +08:00
gaoxin d124d59f1b 【配置】完善逻辑并应用 2021-03-02 15:18:06 +08:00
jiaoyangna 988c8b514e Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 15:08:29 +08:00
jiaoyangna 0182141c66 灵兽提交 2021-03-02 15:08:08 +08:00
ZhangBiao e6a076afa8 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 14:45:52 +08:00
ZhangBiao 3681714bb0 【本地化】牛转钱坤 2021-03-02 14:45:40 +08:00
jiaoyangna 571591eb81 竞技场修改提交 2021-03-02 11:59:01 +08:00
jiaoyangna ae9c306ee6 字体修改优化提交 2021-03-02 11:40:07 +08:00
ZhangBiao 54cfbac8fa 【本地化】巅峰赛白片 2021-03-02 10:57:07 +08:00
JieLing 39a41f45f9 【回滚提交】 2021-03-01 19:48:34 +08:00
ZhangBiao fc08ad0bdf 【本地化】 2021-03-01 18:29:21 +08:00
ZhangBiao 01e39e0435 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-01 17:27:15 +08:00
ZhangBiao dab25d828f 【本地化】 2021-03-01 17:27:06 +08:00
jiaoyangna 3b917f4c87 文字字体修改完善 2021-03-01 17:22:58 +08:00
jiaoyangna 6506a48bad Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-01 17:06:09 +08:00
jiaoyangna f07c4c3952 字体修改提交 2021-03-01 17:06:03 +08:00
zhangqiang 1dd774601a 语法错误 2021-03-01 16:57:23 +08:00
zhangqiang d7f3fc25dd 语法错误 2021-03-01 16:56:52 +08:00
ZhangBiao aef41d8157 【本地化】 2021-03-01 16:18:34 +08:00
ZhangBiao 9b70a72ce7 【本地化】公会boss排名消失 2021-03-01 15:09:10 +08:00
ZhangBiao 84d85ca3a6 【本地化】装备显示错误 2021-03-01 14:49:33 +08:00
ZhangBiao 72f28280ee 【本地化】排行榜显示跳行 2021-03-01 11:39:07 +08:00