xiekaidong
|
bfb9f9834f
|
技能图标变形
|
2023-04-18 21:03:29 +08:00 |
|
chenxi
|
7ee1d620bb
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-18 20:37:24 +08:00 |
|
chenxi
|
342bae9c82
|
bug
|
2023-04-18 20:37:11 +08:00 |
|
xiekaidong
|
bbc04cf46a
|
bug修改
|
2023-04-18 20:37:00 +08:00 |
|
xiekaidong
|
0de7ceb3b3
|
切大波次
|
2023-04-18 19:52:15 +08:00 |
|
xiekaidong
|
ac5183c0fe
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-18 17:58:32 +08:00 |
|
xiekaidong
|
375efc10de
|
一些肉鸽技能接入战斗
|
2023-04-18 17:58:19 +08:00 |
|
chenxi
|
fd4e6d88c4
|
显示属性
|
2023-04-18 17:43:32 +08:00 |
|
xiekaidong
|
65f695030e
|
局内升级
|
2023-04-17 15:43:23 +08:00 |
|
chenxi
|
f291195ccd
|
攻防反了
|
2023-04-16 20:46:55 +08:00 |
|
xiekaidong
|
e58626d82b
|
界面调整
|
2023-04-15 16:57:43 +08:00 |
|
xiekaidong
|
00b1c43f54
|
界面处理
|
2023-04-15 16:54:44 +08:00 |
|
xiekaidong
|
dc5a37ac0f
|
一些细节调整
|
2023-04-15 16:47:18 +08:00 |
|
xiekaidong
|
328515c82a
|
开宝箱
|
2023-04-15 14:57:34 +08:00 |
|
xiekaidong
|
f74a7f6080
|
关卡宝箱
|
2023-04-15 14:45:42 +08:00 |
|
xiekaidong
|
f9541d56d8
|
血条
|
2023-04-14 22:23:03 +08:00 |
|
xiekaidong
|
88b9067fc4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-14 22:19:25 +08:00 |
|
xiekaidong
|
3b909a2a81
|
一些界面修改和接入关卡结算
|
2023-04-14 22:19:22 +08:00 |
|
chenxi
|
c6ae8e7c99
|
血量
|
2023-04-14 21:21:03 +08:00 |
|
xiekaidong
|
642eb4d247
|
战斗回合概念
|
2023-04-14 17:59:12 +08:00 |
|
xiekaidong
|
d1c95c8979
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:18:14 +08:00 |
|
xiekaidong
|
c0eedc10ce
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-13 22:30:12 +08:00 |
|
xiekaidong
|
8424303c97
|
英雄改一下
|
2023-04-13 22:30:08 +08:00 |
|
chenxi
|
15a182cd30
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-13 22:04:25 +08:00 |
|
chenxi
|
d5c99276b5
|
冒伤害
|
2023-04-13 22:04:22 +08:00 |
|
xiekaidong
|
d1b80d3527
|
英雄养成
|
2023-04-13 21:13:43 +08:00 |
|
xiekaidong
|
d5bedb659a
|
加一个大卡片信息
|
2023-04-12 22:11:46 +08:00 |
|
xiekaidong
|
f268d99606
|
reward显示
|
2023-04-12 21:46:16 +08:00 |
|
xiekaidong
|
eb17b324c4
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts:
# lua/app/ui/battle/battle_ui.lua
|
2023-04-12 21:03:40 +08:00 |
|
xiekaidong
|
cbad76a7d9
|
技能回收和吐出来
|
2023-04-12 21:03:07 +08:00 |
|
chenxi
|
31bdd83dae
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-12 18:31:33 +08:00 |
|
chenxi
|
dc66b8833a
|
清理战斗
|
2023-04-12 18:31:30 +08:00 |
|
xiekaidong
|
a2e859e6ee
|
处理一下主界面
|
2023-04-12 17:55:01 +08:00 |
|
xiekaidong
|
4b1875aafd
|
棋盘新的读取方式
|
2023-04-12 15:16:30 +08:00 |
|
xiekaidong
|
4c752c0e78
|
调整一些逻辑
|
2023-04-12 11:19:24 +08:00 |
|
chenxi
|
ce32bb29f6
|
数据
|
2023-04-11 22:45:17 +08:00 |
|
xiekaidong
|
b61b6a6f85
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
|
2023-04-11 22:12:55 +08:00 |
|
xiekaidong
|
990a27220e
|
肉鸽技能和指令集
|
2023-04-11 22:12:52 +08:00 |
|
chenxi
|
8de863c989
|
主城金币
|
2023-04-11 21:58:05 +08:00 |
|
chenxi
|
b33b241e53
|
主界面
|
2023-04-11 20:11:35 +08:00 |
|
chenxi
|
4b621b0e07
|
上阵
|
2023-04-11 20:05:03 +08:00 |
|
chenxi
|
903e4899ca
|
merge
|
2023-04-11 18:24:00 +08:00 |
|
chenxi
|
4d31d587de
|
战斗
|
2023-04-11 18:23:25 +08:00 |
|
xiekaidong
|
85061a5126
|
一些肉鸽技能
|
2023-04-11 17:26:02 +08:00 |
|
chenxi
|
2552a6b595
|
临时文本
|
2023-04-10 21:56:54 +08:00 |
|
chenxi
|
ed7bf4ace4
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
|
2023-04-10 21:54:54 +08:00 |
|
chenxi
|
83eda24cc4
|
英雄界面
|
2023-04-10 21:54:51 +08:00 |
|
xiekaidong
|
eb0856345f
|
一些技能的实现
|
2023-04-10 21:13:31 +08:00 |
|
xiekaidong
|
fb7de22e94
|
技能生成规则
|
2023-04-10 17:03:34 +08:00 |
|
xiekaidong
|
3a0e442a93
|
战斗返回，消除时界面屏蔽点击
|
2023-04-10 10:34:37 +08:00 |
|