Commit Graph

15 Commits (81b3ca1ddc86ee6ffe3456ccdf43344bf8e4b17f)

Author SHA1 Message Date
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
zhangqiang 1d26186851 【挂机】挂机奖励展示问题修改 2021-01-22 13:29:21 +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
guowei df79f56b72 【优化五星成长礼包、心魔试炼礼包】 2020-12-24 13:52:28 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
ZhangBiao fc4e2c35ff bug修改 2020-07-15 14:50:00 +08:00
ZhangBiao 10414deee5 领取挂机宝箱时,增加道具获取动画效果 修改 2020-07-15 11:15:29 +08:00
gaoxin 997ba146bf 奖励界面挂机时长显示修改 2020-07-01 12:09:54 +08:00
JieLing d87ab3767e 内网 0.15.20 2020-06-23 18:36:24 +08:00
JieLing 4c8d2cf8de 提交 2020-05-09 13:31:21 +08:00