chenxi
|
88030484d8
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-16 22:02:45 +08:00 |
|
chenxi
|
f4724ca434
|
战令重复奖励
|
2023-05-16 22:02:42 +08:00 |
|
xiekaidong
|
22d9bb9b3d
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-05-16 21:22:55 +08:00 |
|
xiekaidong
|
97e5506ab2
|
神灯障碍物
|
2023-05-16 21:22:52 +08:00 |
|
xiekaidong
|
91cd324e44
|
神灯
|
2023-05-16 20:39:21 +08:00 |
|
chenxi
|
2b64929a70
|
弹窗调整
|
2023-05-16 19:41:14 +08:00 |
|
xiekaidong
|
e23a631a7d
|
Merge branch 'battle' into dev
# Conflicts:
# lua/app/config/grid_type.lua
# lua/app/config/hero.lua
|
2023-05-16 19:13:37 +08:00 |
|
xiekaidong
|
4605282d53
|
障碍物
|
2023-05-16 19:13:08 +08:00 |
|
chenxi
|
b9023a0a39
|
战令
|
2023-05-16 18:56:54 +08:00 |
|
chenxi
|
f7cd1c6094
|
战令
|
2023-05-16 18:17:05 +08:00 |
|
chenxi
|
32051d90c6
|
战令
|
2023-05-15 21:32:13 +08:00 |
|
chenxi
|
d1f4d67668
|
商城界面
|
2023-05-15 10:43:10 +08:00 |
|
chenxi
|
aa18b68b20
|
宝箱界面
|
2023-05-15 09:36:48 +08:00 |
|
chenxi
|
7e26dee2d3
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-12 21:07:07 +08:00 |
|
chenxi
|
dfc705fbe8
|
商城
|
2023-05-12 21:07:05 +08:00 |
|
xiekaidong
|
fa0b4a354a
|
Merge branch 'battle' into dev
|
2023-05-12 20:29:39 +08:00 |
|
chenxi
|
6369eab7f6
|
战令
|
2023-05-12 15:32:53 +08:00 |
|
chenxi
|
2a8dd6bbca
|
主城资源栏
|
2023-05-12 11:54:45 +08:00 |
|
xiekaidong
|
39a2eee61a
|
格子类型的一些配置改为配置表控制
|
2023-05-12 11:43:49 +08:00 |
|
chenxi
|
7005bd8c0f
|
帮助界面
|
2023-05-12 11:28:11 +08:00 |
|
chenxi
|
b5b1ad00e7
|
红点
|
2023-05-12 11:23:06 +08:00 |
|
chenxi
|
4306ab73ad
|
任务
|
2023-05-12 10:44:57 +08:00 |
|
chenxi
|
c44ce67f07
|
任务
|
2023-05-11 22:22:03 +08:00 |
|
chenxi
|
b1ca8106a9
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
# Conflicts:
# lua/app/config/act_chapter_store.lua.meta
# lua/app/config/act_gift.lua
# lua/app/config/act_growup_gift.lua.meta
# lua/app/config/act_level_fund.lua.meta
# lua/app/config/act_sevenday_quest.lua
# lua/app/config/act_sevenday_quest.lua.meta
# lua/app/config/act_sevenday_quest_reward.lua.meta
# lua/app/config/buff.lua
# lua/app/config/player_exp.lua.meta
# lua/app/config/strings/cn/task.lua.meta
# lua/app/config/strings/de/task.lua.meta
# lua/app/config/strings/en/task.lua.meta
# lua/app/config/strings/fr/task.lua.meta
# lua/app/config/strings/ja/task.lua.meta
# lua/app/config/strings/ko/task.lua.meta
# lua/app/config/strings/zh/task.lua.meta
|
2023-05-11 21:34:45 +08:00 |
|
chenxi
|
4e95b11e21
|
任务
|
2023-05-11 21:29:27 +08:00 |
|
xiekaidong
|
4bf948f670
|
表现修改一下
|
2023-05-11 20:14:59 +08:00 |
|
chenxi
|
482e1a2127
|
任务
|
2023-05-11 18:20:10 +08:00 |
|
xiekaidong
|
9d70b5b8b1
|
随机消除x个技能元素 的技能机制
|
2023-05-11 15:17:42 +08:00 |
|
xiekaidong
|
5fc337e78b
|
改变棋盘所有元素的技能机制
|
2023-05-11 14:31:24 +08:00 |
|
chenxi
|
760527284d
|
任务
|
2023-05-11 11:26:46 +08:00 |
|
chenxi
|
dc81cffe85
|
任务
|
2023-05-11 11:22:11 +08:00 |
|
chenxi
|
124feb0b09
|
任务
|
2023-05-11 10:09:29 +08:00 |
|
chenxi
|
df3a225ebd
|
任务
|
2023-05-09 17:41:27 +08:00 |
|
chenxi
|
8e590c242b
|
任务
|
2023-05-09 15:24:20 +08:00 |
|
chenxi
|
4b6ee24312
|
购买体力
|
2023-05-09 14:52:36 +08:00 |
|
chenxi
|
247b595bba
|
语言
|
2023-05-09 11:04:23 +08:00 |
|
chenxi
|
de1dcb85d5
|
主城
|
2023-05-09 09:43:35 +08:00 |
|
chenxi
|
d930b3ded7
|
设置
|
2023-05-08 21:45:28 +08:00 |
|
chenxi
|
3c6a538338
|
设置
|
2023-05-08 21:10:41 +08:00 |
|
chenxi
|
1ca913bfce
|
设置
|
2023-05-08 20:39:33 +08:00 |
|
chenxi
|
8022de6c90
|
设置界面
|
2023-05-08 20:09:55 +08:00 |
|
xiekaidong
|
925c8ffdea
|
gm命令
|
2023-05-08 11:17:18 +08:00 |
|
xiekaidong
|
18c83cfa0c
|
联网
|
2023-05-08 11:02:42 +08:00 |
|
xiekaidong
|
cb0e613e47
|
Merge branch 'dev' into net
|
2023-05-08 09:48:06 +08:00 |
|
xiekaidong
|
55ec0dd76c
|
联网
|
2023-05-08 09:47:58 +08:00 |
|
chenxi
|
ff6226a2df
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-06 11:34:43 +08:00 |
|
chenxi
|
04e6bdcfda
|
主城侧边栏
|
2023-05-06 11:34:41 +08:00 |
|
xiekaidong
|
5ee674bc60
|
界面宝箱调整
|
2023-05-06 10:04:32 +08:00 |
|
chenxi
|
5e2644ee6e
|
主城
|
2023-05-05 22:03:42 +08:00 |
|
chenxi
|
606ec1e5c0
|
缩进
|
2023-05-05 21:06:27 +08:00 |
|