Commit Graph

51 Commits (1980c015731b6423094c9d121e13d1e7a7f2093d)

Author SHA1 Message Date
ZhangBiao 1980c01573 【竞技场】时间到弹出 2021-04-30 11:49:45 +08:00
ZhangBiao 4f2c8ad573 【竞技场】回滚提交 2021-04-29 17:46:23 +08:00
ZhangBiao f634ae4e4b 【竞技场、云游商人】竞技场时间到未弹出,云游增加log 2021-04-29 17:42:35 +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 b53717c9ee 【本地化】还原文本 2021-04-01 18:41:50 +08:00
JieLing c945f53946 【修改bug】提交 竞技场 + 试炼奖励优化list重叠 2021-03-16 16:06:55 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna 1cd3d4cdaa 文字提交 2021-03-12 14:20:14 +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
jiaoyangna f7a06a5783 竞技守卫修改 2021-03-02 18:05:06 +08:00
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
zhangqiang 152650dc3f 【ScrollCycleView】修改6 2021-02-26 17:26:45 +08:00
jiaoyangna b93f69cfa6 文字导出 2021-02-26 09:59:01 +08:00
jiaoyangna df38aea68e 巅峰赛修改 2021-02-25 14:20:29 +08:00
jiaoyangna e709c80428 竞技场修改 2021-02-25 13:47:04 +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 3b83a72215 【本地化】文字还原 2021-01-26 11:05:27 +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 e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
JieLing cb6c7d393b 【竞技场】修复奖励不刷新2 2020-10-20 02:49:25 +08:00
JieLing 534ee58f6a 【竞技场】添加挑战次数显示,修复挑战后奖励显示不刷新的问题 2020-10-20 02:31:13 +08:00
jiaoyangna 93db6c028a 竞技场奖励显示错误 2020-10-20 00:21:08 +08:00
ZhangBiao 56f5856a71 宝箱个数减负 2020-10-19 20:10:53 +08:00
ZhangBiao 43201d2172 每日 赛季奖励 显示错误修复 2020-10-19 19:41:36 +08:00
ZhangBiao b52ebf46f4 竞技场 bug修改 2020-10-19 19:34:48 +08:00
ZhangBiao 4c5065ccf7 竞技场界面修改 2020-10-19 18:52:36 +08:00
ZhangBiao bae7d6550e 竞技场界面修改 2020-10-16 19:36:21 +08:00
gaoxin b3d15c1945 头像特效添加 2020-09-27 16:58:10 +08:00
ZhangBiao 04b18aa4ad 竞技场有免费次数 时提示红点 2020-09-03 14:42:31 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna d8fa2b9459 头像背景修改 2020-07-25 19:59:43 +08:00
jiaoyangna 064b819f4a 修改星星提交 2020-07-24 20:03:06 +08:00
zhangqiang f234c1a174 竞技场中文字修改 2020-07-20 16:07:30 +08:00
zhangqiang 99f885ac22 竞技场宝箱奖励位置可配 2020-07-20 16:01:16 +08:00
zhangqiang a325bfb781 竞技场排名 2020-07-20 15:34:30 +08:00
zhangqiang c471a9ccd5 竞技场替换宝箱效果图替换 2020-07-20 11:28:19 +08:00
zhangqiang 70bbb3cee2 竞技场修改 2020-07-07 13:29:40 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00