Commit Graph

81 Commits (5c778aad2224df6289594ff77016c1f28df7f83f)

Author SHA1 Message Date
jiaoyangna 5c778aad22 森罗幻境】试炼精气特效消失 2021-06-01 10:58:46 +08:00
jiaoyangna e63200f4a2 预设修改提交 2021-05-28 16:26:12 +08:00
jiaoyangna 666f77c3db 无尽修改提交 2021-05-27 17:34:59 +08:00
jiaoyangna da6437e2a2 无尽提交 2021-05-27 10:46:22 +08:00
jiaoyangna da6dd0283c 编队修改提交 2021-05-25 20:37:12 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00
jiaoyangna a10ec722e5 无尽副本提交 2021-05-24 11:51:11 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
gaoxin 12856c1287 【ui】修复跳转后导致tip报错 2021-04-22 16:50:45 +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 071a91773a 导出 文本提交 2021-04-09 12:26:35 +08:00
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin 68493d2b60 【本地化】还原文本 2021-04-01 18:45:39 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna 1cd3d4cdaa 文字提交 2021-03-12 14:20:14 +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
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 802881378c Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
2021-01-26 11:08:54 +08:00
gaoxin 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +08:00
jiaoyangna 7666faad78 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-15 10:50:27 +08:00
jiaoyangna 3a7324883e 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-14 15:24:51 +08:00
jiaoyangna be993c9905 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-12 19:21:20 +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
jiaoyangna a5a93d43a7 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-07 19:24:04 +08:00
ZhangBiao 2fed5ddb45 【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复 2021-01-04 11:04:37 +08:00
zhangqiang 739f390115 Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
2020-12-29 17:00:08 +08:00
ZhangBiao 927aa7053b .进入无尽副本上阵阵容之后推出副本,在挑战关卡、神将-编队无法上三星及以下英雄(不显示) 2020-12-29 10:28:10 +08:00
ZhangBiao 574a0da116 【编队】进入无尽副本后 主线编队无法上阵20级以下英雄修复 2020-12-29 10:24:50 +08:00
ZhangBiao c649621d85 【森罗幻境】下方头像顺序,后端把顺序换了 2020-12-28 15:19:46 +08:00
ZhangBiao 1431423c4f 【森罗幻境】移动过程中打开其他界面问题修复 2020-12-18 11:39:01 +08:00
ZhangBiao e3e95e2379 森罗 无尽 流程优化和界面调整 2020-09-02 13:35:29 +08:00
ZhangBiao 91061ae00a 无尽红点刷新修复 2020-09-01 15:32:24 +08:00
ZhangBiao 9942bd50bb 回春散使用bug修复 2020-08-31 19:54:14 +08:00
ZhangBiao 2a2eac8cbb 森罗战斗失败两次弹出失败 2020-08-27 18:31:39 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
ZhangBiao 811418e222 森罗 无尽红点 2020-08-27 13:59:14 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
ZhangBiao e9b8083148 2020-08-20 14:43:48 +08:00
ZhangBiao f93c57fd31 副本快结束啦! 2020-08-19 20:57:04 +08:00