puxuan
|
9a9254de99
|
活动
|
2025-09-28 20:04:42 +08:00 |
|
puxuan
|
0736e58c5f
|
主界面图标
|
2025-09-28 16:09:37 +08:00 |
|
puxuan
|
a20f3f0dd1
|
活动
|
2025-09-25 16:04:15 +08:00 |
|
puxuan
|
56936f582b
|
商店
|
2025-09-24 16:21:47 +08:00 |
|
Fang
|
f6c4010add
|
波次锦标赛
|
2023-09-28 10:23:25 +08:00 |
|
xiekaidong
|
820a22b051
|
Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
# lua/app/common/bi_report.lua
# lua/app/common/data_manager.lua
# lua/app/common/pay_manager.lua
# lua/app/config/activity_pvp_board.lua.meta
# lua/app/config/const.lua
# lua/app/config/item.lua
# lua/app/config/monster_activity.lua
# lua/app/config/monster_base.lua
# lua/app/config/skill.lua
# lua/app/config/skin.lua
# lua/app/config/skin_skill.lua
# lua/app/config/strings/cn/global.lua
# lua/app/config/strings/cn/item.lua
# lua/app/config/strings/cn/skill_rogue.lua
# lua/app/config/strings/cn/skin.lua
# lua/app/config/strings/de/item.lua
# lua/app/config/strings/de/skin.lua
# lua/app/config/strings/en/item.lua
# lua/app/config/strings/en/skin.lua
# lua/app/config/strings/es/item.lua
# lua/app/config/strings/es/skin.lua
# lua/app/config/strings/fr/item.lua
# lua/app/config/strings/fr/skin.lua
# lua/app/config/strings/id/item.lua
# lua/app/config/strings/id/skin.lua
# lua/app/config/strings/ja/item.lua
# lua/app/config/strings/ja/skin.lua
# lua/app/config/strings/ko/item.lua
# lua/app/config/strings/ko/skin.lua
# lua/app/config/strings/pt/item.lua
# lua/app/config/strings/pt/skin.lua
# lua/app/config/strings/ru/item.lua
# lua/app/config/strings/ru/skin.lua
# lua/app/config/strings/th/item.lua
# lua/app/config/strings/th/skin.lua
# lua/app/config/strings/vi/item.lua
# lua/app/config/strings/vi/skin.lua
# lua/app/config/strings/zh/item.lua
# lua/app/config/strings/zh/skin.lua
# lua/app/config/task_type.lua.meta
# lua/app/global/global_const.lua
# lua/app/module/battle/battle_const.lua
# lua/app/module/battle/battle_manager.lua
|
2023-09-16 17:55:38 +08:00 |
|
Fang
|
8c1082793e
|
圆月活动
|
2023-09-15 19:22:15 +08:00 |
|
xiekaidong
|
8b6b8d2772
|
数据层
|
2023-09-15 17:28:14 +08:00 |
|
Fang
|
f1f1daafa2
|
符文功能
|
2023-09-12 10:35:46 +08:00 |
|
Fang
|
89eeac3f2d
|
新手14天乐
|
2023-09-01 15:35:19 +08:00 |
|
Fang
|
2da8da07d0
|
装备升级礼包
|
2023-08-24 17:29:33 +08:00 |
|
xiekaidong
|
c880279be1
|
英雄基金
|
2023-08-18 18:08:48 +08:00 |
|
Fang
|
e0db8bcfda
|
夏日活动
|
2023-08-11 11:52:12 +08:00 |
|
Fang
|
2933776048
|
支线基金
|
2023-07-24 11:54:09 +08:00 |
|
Fang
|
61b302305e
|
装备礼包
|
2023-07-21 09:35:21 +08:00 |
|
xiekaidong
|
6f85752093
|
firebase、af、fb日志上报
|
2023-07-18 15:06:30 +08:00 |
|
xiekaidong
|
0157ca5d27
|
一些日志上报混乱修复
|
2023-07-11 11:02:14 +08:00 |
|
Fang
|
b8155b97de
|
成长礼包触发方式修改
|
2023-07-06 18:17:37 +08:00 |
|
xiekaidong
|
c976166cc9
|
竞技场弹窗礼包
|
2023-07-03 19:57:39 +08:00 |
|
Fang
|
abe661f228
|
空名称处理
|
2023-07-03 14:16:03 +08:00 |
|
CloudJ
|
b88c471ce0
|
Merge branch 'dev' into arena
# Conflicts:
# lua/app/common/bi_report.lua
|
2023-06-27 17:25:42 +08:00 |
|
CloudJ
|
b59a8d20d6
|
入门礼包
|
2023-06-27 17:24:32 +08:00 |
|
CloudJ
|
fdc773df09
|
竞技场战令
|
2023-06-26 11:26:28 +08:00 |
|
chenxi
|
af1c4f72a7
|
支付调整
|
2023-06-15 10:11:08 +08:00 |
|
chenxi
|
9666158491
|
adjust上报
|
2023-06-14 21:43:02 +08:00 |
|
chenxi
|
119a6eaa27
|
支付
|
2023-06-14 18:57:09 +08:00 |
|
chenxi
|
fb18182d6a
|
ios 支付
|
2023-06-14 18:43:04 +08:00 |
|
xiekaidong
|
35053faa9b
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-06-14 16:00:20 +08:00 |
|
xiekaidong
|
17ad018a43
|
日志上报
|
2023-06-14 16:00:17 +08:00 |
|
chenxi
|
d3bb4c3698
|
Merge branch 'dev_ios' into dev
|
2023-06-14 15:40:47 +08:00 |
|
chenxi
|
02cdb96b4b
|
ios支付
|
2023-06-13 18:19:01 +08:00 |
|
chenxi
|
1b27a8dfae
|
ios支付参数
|
2023-06-13 18:05:16 +08:00 |
|
chenxi
|
acccd99660
|
adjust事件
|
2023-06-09 19:00:54 +08:00 |
|
chenxi
|
4e4719a51e
|
ios 支付
|
2023-06-09 16:39:45 +08:00 |
|
chenxi
|
89d068133e
|
ios支付
|
2023-06-09 16:30:17 +08:00 |
|
xiekaidong
|
1ddb7bd43b
|
ios支付处理
|
2023-06-09 16:08:22 +08:00 |
|
xiekaidong
|
cc8bace10b
|
上报修复
|
2023-06-08 17:07:04 +08:00 |
|
xiekaidong
|
75bcd50e85
|
支付奖励上报修复
|
2023-06-08 12:06:03 +08:00 |
|
xiekaidong
|
c800a0cc31
|
日志上报
|
2023-06-07 17:25:08 +08:00 |
|
chenxi
|
be043ef0d1
|
支付上报
|
2023-06-06 15:50:33 +08:00 |
|
chenxi
|
16975e700e
|
充值后没有绑定则提示绑定
|
2023-06-05 18:32:51 +08:00 |
|
xiekaidong
|
5d5ba37a4b
|
支付成功时没绑定账号，提示绑定账号
|
2023-06-05 18:02:12 +08:00 |
|
xiekaidong
|
7acd32c46c
|
更改奖励上报
|
2023-06-05 15:35:05 +08:00 |
|
chenxi
|
a225025d02
|
支付code
|
2023-06-04 22:12:28 +08:00 |
|
CloudJ
|
23fca8d7bf
|
更新首充界面
|
2023-05-29 17:15:54 +08:00 |
|
chenxi
|
5ab6aac2b6
|
代码重命名
|
2023-05-29 10:54:10 +08:00 |
|
CloudJ
|
01922a4c0d
|
成长礼包
|
2023-05-26 15:44:35 +08:00 |
|
CloudJ
|
423b4a8f78
|
助力与金币礼包
|
2023-05-25 12:00:57 +08:00 |
|
CloudJ
|
602cd716df
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/common/pay_manager.lua
|
2023-05-25 10:18:31 +08:00 |
|
chenxi
|
4212a80a4a
|
等级基金
|
2023-05-24 21:05:52 +08:00 |
|