CloudJ
|
e62e42c62a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-22 09:59:32 +08:00 |
|
chenxi
|
14bf5e913d
|
编译
|
2023-05-19 21:58:07 +08:00 |
|
xiekaidong
|
ae8da29f23
|
bug修复
|
2023-05-19 21:44:46 +08:00 |
|
xiekaidong
|
5ace2ecbbd
|
bug修复
|
2023-05-19 21:38:16 +08:00 |
|
xiekaidong
|
f609e0c83c
|
随机位置
|
2023-05-19 20:59:31 +08:00 |
|
xiekaidong
|
860baa56b7
|
effectGrid
|
2023-05-19 20:56:01 +08:00 |
|
xiekaidong
|
27bd9d3b09
|
果冻
|
2023-05-19 20:45:09 +08:00 |
|
chenxi
|
0df1c5bbc2
|
邮箱
|
2023-05-19 20:15:49 +08:00 |
|
chenxi
|
48f22d6749
|
邮箱界面
|
2023-05-19 20:15:24 +08:00 |
|
xiekaidong
|
ae5286166b
|
死局问题修改
|
2023-05-19 20:09:56 +08:00 |
|
CloudJ
|
e1d162f918
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-19 20:04:45 +08:00 |
|
CloudJ
|
098207b6a4
|
tmp
|
2023-05-19 20:04:43 +08:00 |
|
xiekaidong
|
d718880622
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/lua/app/module/mail.meta
# Assets/lua/app/module/mail/mail_const.lua.bytes.meta
# Assets/lua/app/module/mail/mail_manager.lua.bytes.meta
# Assets/lua/app/ui/mail.meta
# Assets/lua/app/ui/mail/cell.meta
# Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes.meta
# Assets/lua/app/ui/mail/mail_detail_ui.lua.bytes.meta
# Assets/lua/app/ui/mail/mail_ui.lua.bytes.meta
# Assets/lua/app/userdata/mail.meta
# Assets/lua/app/userdata/mail/mail_data.lua.bytes.meta
# Assets/lua/app/userdata/mail/mail_entity.lua.bytes.meta
|
2023-05-19 20:01:08 +08:00 |
|
xiekaidong
|
ee9f6680b9
|
更新资源
|
2023-05-19 20:00:57 +08:00 |
|
chenxi
|
7443442ca1
|
购买体力以及邮箱初版
|
2023-05-19 18:33:51 +08:00 |
|
xiekaidong
|
36950a4364
|
更新pb
|
2023-05-19 18:23:35 +08:00 |
|
xiekaidong
|
8d6d445e71
|
更新pb
|
2023-05-19 18:23:23 +08:00 |
|
chenxi
|
de9ffbb1b8
|
界面调整
|
2023-05-19 17:20:17 +08:00 |
|
chenxi
|
ebb71fdd31
|
任务点击箱子的tips
|
2023-05-19 16:52:45 +08:00 |
|
chenxi
|
d2b296fe95
|
宝箱tips
|
2023-05-19 16:37:44 +08:00 |
|
xiekaidong
|
1eae40bf23
|
更新配置
|
2023-05-19 16:29:20 +08:00 |
|
chenxi
|
03342a6b3a
|
挂机表现
|
2023-05-19 15:12:04 +08:00 |
|
chenxi
|
c0fbf18c6a
|
快速挂机界面
|
2023-05-19 14:57:22 +08:00 |
|
chenxi
|
07fe75f380
|
挂机表现
|
2023-05-19 14:50:46 +08:00 |
|
xiekaidong
|
7d72a0fbad
|
新增技能机制
|
2023-05-19 10:52:23 +08:00 |
|
xiekaidong
|
3614971a7c
|
被动触发时机
|
2023-05-19 10:00:47 +08:00 |
|
chenxi
|
bcdbcec1db
|
编译
|
2023-05-18 22:11:58 +08:00 |
|
xiekaidong
|
efaa9ff92a
|
修改prefab
|
2023-05-18 22:09:30 +08:00 |
|
xiekaidong
|
2be4a98158
|
Merge branch 'battle' into dev
|
2023-05-18 22:08:08 +08:00 |
|
xiekaidong
|
dc04ab6f9e
|
修改prefab
|
2023-05-18 22:07:48 +08:00 |
|
chenxi
|
9a122cf094
|
编译
|
2023-05-18 20:32:53 +08:00 |
|
chenxi
|
d04af0c07b
|
项目命名规范
|
2023-05-18 15:47:29 +08:00 |
|
chenxi
|
3b90d16d0c
|
编译
|
2023-05-18 15:40:48 +08:00 |
|
chenxi
|
fae19ebd8c
|
挂机
|
2023-05-18 15:40:07 +08:00 |
|
xiekaidong
|
083d260769
|
技能修改
|
2023-05-18 11:19:11 +08:00 |
|
xiekaidong
|
54fcd748cf
|
多段伤害
|
2023-05-18 10:59:17 +08:00 |
|
chenxi
|
168c556b6d
|
挂机
|
2023-05-17 22:28:55 +08:00 |
|
chenxi
|
9c2d1e7599
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-17 20:25:34 +08:00 |
|
chenxi
|
b71f9c6327
|
界面调整
|
2023-05-17 20:25:31 +08:00 |
|
xiekaidong
|
6d19ff3c7c
|
宝箱显示
|
2023-05-17 20:18:34 +08:00 |
|
xiekaidong
|
348c971575
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-17 20:18:17 +08:00 |
|
xiekaidong
|
6eff2eda52
|
宝箱显示
|
2023-05-17 20:18:13 +08:00 |
|
chenxi
|
88aa8c35e3
|
编译
|
2023-05-17 20:06:15 +08:00 |
|
chenxi
|
09daa5d978
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-17 20:05:41 +08:00 |
|
chenxi
|
1a5501f761
|
更新协议
|
2023-05-17 20:05:38 +08:00 |
|
xiekaidong
|
fff1c9260e
|
宝箱
|
2023-05-17 19:20:18 +08:00 |
|
xiekaidong
|
8c62657b03
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
|
2023-05-17 19:20:05 +08:00 |
|
xiekaidong
|
fced065f12
|
宝箱
|
2023-05-17 19:20:02 +08:00 |
|
chenxi
|
f2622a2ae2
|
tips
|
2023-05-17 19:05:57 +08:00 |
|
chenxi
|
d880ae0f51
|
多语言
|
2023-05-17 16:26:56 +08:00 |
|