Commit Graph

31 Commits (579f2806c31ac566411902401b3f9fbe3a810831)

Author SHA1 Message Date
jiaoyangna 579f2806c3 竞技守卫名字修改提交
(cherry picked from commit d3efa809d8)
2021-03-12 16:35:55 +08:00
jiaoyangna 838de7cd1c 文字提交 2021-03-12 14:31:52 +08:00
jiaoyangna 1cd3d4cdaa 文字提交 2021-03-12 14:20:14 +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
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
guowei 344ec52500 【巅峰赛头像修改】 2021-01-18 15:07:23 +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
zhangqiang c79285e4ca 【竞技场】在线等待赛季刷新,攻击次数奖励异常-dev 2020-12-29 17:36:01 +08:00
zhangqiang 1227e93456 【寻宝】 优化 加锁 1 2020-12-29 16:56:18 +08:00
zhangqiang 90df5e453f 【竞技场】 1209bug 竞技场跳过战斗按钮,解锁条件同关卡 2020-12-10 13:37:44 +08:00
ZhangBiao de32379f8e 【竞技场】竞技场增加输赢奖励 2020-11-07 18:52:04 +08:00
ZhangBiao 14ce57d5f0 2020-09-03 17:54:13 +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
zhangqiang 70bbb3cee2 竞技场修改 2020-07-07 13:29:40 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 59db757cf9 六月三号开发提交 2020-06-03 19:09:01 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00