8 Commits

Author SHA1 Message Date
Fang
692277440e 定时器处理 2023-08-24 18:20:58 +08:00
Fang
2da8da07d0 装备升级礼包 2023-08-24 17:29:33 +08:00
xiekaidong
42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
2023-08-08 15:58:56 +08:00
xiekaidong
f74226c056 增加上报属性 2023-08-07 10:35:11 +08:00
xiekaidong
e05f02088c 统一接口,金币不足提示弹窗询问 2023-08-03 14:53:51 +08:00
Fang
0d04b99d3e 显示fix 2023-07-24 21:39:18 +08:00
Fang
bafb8673ec 装备升级材料获取 2023-07-21 09:50:45 +08:00
Fang
28bf5ab6ad 装备系统 2023-07-20 10:15:42 +08:00