Commit Graph

64 Commits (bb1e41633a06cb41dbb210602cec4cb58b5c8e37)

Author SHA1 Message Date
jiaoyangna c8e7d0cdd4 编队界面看神将情报错误修改 2021-11-12 15:51:26 +08:00
ZhangBiao f18880622e 【新·魂灵宝】提交 2021-11-09 17:06:47 +08:00
ZhangBiao 12e46be512 【装备界面】提交 2021-11-09 10:22:16 +08:00
wangzhenxing e99f8c285f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-11-08 14:02:57 +08:00
wangzhenxing 95b7fceb34 [神魂]======神魂升级后技能描述修改 2021-11-08 14:02:33 +08:00
jiaoyangna 024b684999 排行榜神魂放大镜显示错误修改 2021-11-08 10:51:51 +08:00
wangzhenxing a92a76e3ab 【神魂】=====技能描述修改 2021-11-05 17:21:18 +08:00
jiaoyangna 0d68d9229b 神魂提交 2021-11-05 10:18:10 +08:00
jiaoyangna 34d8cf4440 神魂位置提交 2021-11-04 09:27:56 +08:00
jiaoyangna 125e37fe6d 神魂提交 2021-11-03 10:13:44 +08:00
jiaoyangna d4d9b88fe7 神魂修改提交 2021-10-27 15:24:46 +08:00
jiaoyangna d398c21668 神魂提交 2021-10-27 12:50:15 +08:00
jiaoyangna 5e8ad7dd08 神魂提交 2021-10-26 16:00:31 +08:00
gaoxin 66efc9d4e3 【战斗力】新战斗力计算系统完成 2021-09-16 13:35:33 +08:00
gaoxin 7df51e8929 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
2021-09-11 16:52:33 +08:00
jiaoyangna 7713a65826 排行榜宝器修改 2021-08-31 11:08:12 +08:00
jiaoyangna 1ea100ed83 神将情报界面装备宝物修改提交 2021-08-30 16:44:26 +08:00
zhangqiang c957a96983 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-09 14:48:14 +08:00
zhangqiang abb9873f80 【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级 2021-08-04 17:42:47 +08:00
gaoxin 30b329a837 【ios】图片回收 2021-04-21 13:12:04 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
jiaoyangna e7dff66a4f 品阶错误修改 2021-03-29 10:15:25 +08:00
jiaoyangna aa94edf1d7 Merge branch 'xma/dev' into 0功能/本周版本优化内容 2021-03-12 16:41:18 +08:00
ZhangBiao 51c0b51a87 【本地化】魂灵宝处需要修改 2021-03-12 15:07:17 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna 8430af12af 文字提交 2021-03-12 14:24:41 +08:00
ZhangBiao 4631f663a8 【本地化】魂灵宝处需要修改 2021-03-11 10:41:34 +08:00
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
jiaoyangna e4f4649cf9 文本提交 2021-02-20 18:01:57 +08:00
jiaoyangna 602dbc924c 文本还原 2021-02-20 16:43:44 +08:00
gaoxin 78e7305c15 【本地化】导出中文 2021-02-05 15:58:37 +08:00
gaoxin 927025f6de 【本地化】中文字还原,合并用 2021-02-05 12:44:50 +08:00
zhangqiang df943f6da9 【新战力计算】修改调用接口提交 2021-01-29 15:04:07 +08:00
gaoxin adf591cbec 【本地化】lua代码还原 2021-01-27 18:16:54 +08:00
gaoxin c567dcd426 【本地化】代码本地化提交 2021-01-26 17:08:39 +08:00
gaoxin 81b3ca1ddc 【本地化】 中文字还原,合并代码用 2021-01-26 11:13:09 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
zhangqiang f283d579c4 【新战斗力计算】1 2021-01-22 16:53:50 +08:00
gaoxin f501e92272 【本地化】代码还原,合并用 2021-01-12 11:00:44 +08:00
gaoxin ae7da93056 【本地化】还原文字 2021-01-12 10:56:26 +08:00
gaoxin 27b3c1ea32 【本地化】还原文本到代码中合并用 2021-01-09 14:20:06 +08:00
ZhangBiao 9601af33e7 【神将详情】排行榜查看他人装备显示出售按钮修复 2020-11-16 16:20:15 +08:00
zhangqiang 0ca5e4ea13 【觉醒】bug 2020-11-11 20:21:37 +08:00
zhangqiang c206f6487e 【灵兽系统】 漏合 2020-11-02 10:59:17 +08:00
JieLing bff69e473d 招募玩家详情展示魂印有问题 2020-10-13 15:51:20 +08:00
zhangqiang f56fa9d4e8 线上问题 大闹天宫招募带宝器的英雄是报错 2020-10-09 15:20:53 +08:00
jiaoyangna 59204790d2 xuanyuan commit 2020-08-26 10:58:41 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00