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 |
|
xiekaidong
|
8801943ae3
|
整理一下代码，接入联网
|
2023-05-05 18:27:33 +08:00 |
|
chenxi
|
50a2ff4b9f
|
金猪
|
2023-05-05 14:59:02 +08:00 |
|
chenxi
|
be01873d54
|
金猪
|
2023-05-05 11:57:41 +08:00 |
|
chenxi
|
d37872ad7b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-05-05 10:32:54 +08:00 |
|
chenxi
|
47cd13f4ad
|
一些系统代码
|
2023-05-05 10:32:50 +08:00 |
|
xiekaidong
|
07b11eea6f
|
节奏调整
|
2023-05-04 18:06:03 +08:00 |
|
xiekaidong
|
4d2dd8a013
|
节奏
|
2023-05-04 17:41:52 +08:00 |
|
xiekaidong
|
8410ac0c78
|
调整一下下落动画节奏
|
2023-05-04 17:32:01 +08:00 |
|
chenxi
|
e45900ee6f
|
删除不用的代码
|
2023-04-27 20:06:36 +08:00 |
|
chenxi
|
212dfb79bd
|
combo
|
2023-04-27 19:14:25 +08:00 |
|
chenxi
|
ab9b933521
|
combo动画
|
2023-04-27 18:38:19 +08:00 |
|
xiekaidong
|
c0fea24029
|
技能回收最多3个
|
2023-04-27 17:43:27 +08:00 |
|
xiekaidong
|
40179a3e67
|
暂停界面显示修改
|
2023-04-27 16:30:09 +08:00 |
|
xiekaidong
|
c9955a7816
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-27 15:24:27 +08:00 |
|
xiekaidong
|
c01cc5c9db
|
bug修复
|
2023-04-27 15:24:24 +08:00 |
|
chenxi
|
de85c2b85c
|
资源栏
|
2023-04-27 14:40:03 +08:00 |
|
chenxi
|
76615c949d
|
适配
|
2023-04-27 14:26:44 +08:00 |
|
chenxi
|
6d06898082
|
刘海屏
|
2023-04-27 14:09:52 +08:00 |
|
chenxi
|
d62c7b8d54
|
震屏bug
|
2023-04-27 11:00:06 +08:00 |
|
chenxi
|
783ade4a69
|
刘海屏适配
|
2023-04-26 23:06:03 +08:00 |
|
chenxi
|
343c6bdcc9
|
连击效果
|
2023-04-26 22:24:08 +08:00 |
|
xiekaidong
|
0a68394c62
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-26 21:46:39 +08:00 |
|