2414 Commits

Author SHA1 Message Date
chenxi
7354b90491 编译 2023-04-21 23:33:09 +08:00
chenxi
320ce037ce 打包 2023-04-21 23:16:26 +08:00
chenxi
8c4fb9c3c9 . 2023-04-21 23:11:05 +08:00
chenxi
f75248ee11 打包 2023-04-21 23:10:01 +08:00
chenxi
5de5ab0693 包名 2023-04-21 23:06:13 +08:00
chenxi
dce63f5fab ab name 2023-04-21 23:03:02 +08:00
chenxi
1cf51cc739 资源处理和ab name 2023-04-21 22:55:50 +08:00
chenxi
ae89ac5e4d 改名 2023-04-21 22:48:37 +08:00
chenxi
f24eab3ae0 gaiming 2023-04-21 22:48:19 +08:00
chenxi
25a1685a4b b6 2023-04-21 22:46:39 +08:00
chenxi
40b4ce4bf4 结算界面 2023-04-21 22:42:16 +08:00
chenxi
b76b914238 编译 2023-04-21 22:15:49 +08:00
xiekaidong
a1ca05dbb9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 21:40:57 +08:00
xiekaidong
2152e1e755 战斗音效 2023-04-21 21:40:55 +08:00
chenxi
dd040045c9 编译 2023-04-21 21:25:02 +08:00
xiekaidong
dfdb8ce4e8 节奏调整 2023-04-21 21:21:07 +08:00
xiekaidong
2311761568 表现修改 2023-04-21 21:03:21 +08:00
xiekaidong
06b54d8f34 bug修复 2023-04-21 20:50:58 +08:00
xiekaidong
2ca036aed9 重新生成xlua 2023-04-21 20:46:51 +08:00
xiekaidong
415fecdf8f bug修复 2023-04-21 20:45:15 +08:00
xiekaidong
36a8f3c066 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
2023-04-21 20:44:49 +08:00
xiekaidong
9f0b9e921d bug修复 2023-04-21 20:44:09 +08:00
chenxi
26a7e3915b Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-21 20:38:08 +08:00
chenxi
e2d6673810 资源 2023-04-21 20:37:42 +08:00
xiekaidong
1bbedf0181 引导适配 2023-04-21 20:36:46 +08:00
xiekaidong
67e1428e45 更新配置 2023-04-21 19:49:33 +08:00
chenxi
56859eb886 FB设置 2023-04-21 19:22:38 +08:00
2a1c37c51d Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 18:48:06 +08:00
4500ec3b76 11111111111 2023-04-21 18:47:54 +08:00
chenxi
a2419d68cf bianyi 2023-04-21 18:38:59 +08:00
908d5701b3 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 18:27:11 +08:00
977e00a4ec 11111111 2023-04-21 18:27:02 +08:00
chenxi
2eb797b0ed 编译 2023-04-21 18:23:00 +08:00
xiekaidong
09f97143a6 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
2023-04-21 18:16:55 +08:00
xiekaidong
fbeee8a970 引导和报错 2023-04-21 18:16:42 +08:00
chenxi
43eb5ba803 编译 2023-04-21 17:59:18 +08:00
chenxi
a2173b0565 编译 2023-04-21 17:44:37 +08:00
xiekaidong
2665fe4a50 i18nbug修复 2023-04-21 17:37:33 +08:00
xiekaidong
cf15eb8953 初始化数据 2023-04-21 17:05:52 +08:00
xiekaidong
b9511a8d4b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
2023-04-21 16:49:55 +08:00
xiekaidong
53a33007d9 关卡固定肉鸽技能、技能可以开始就任意链接 2023-04-21 16:49:46 +08:00
chenxi
77c5806104 merge 2023-04-21 16:32:08 +08:00
chenxi
ad3f9961d7 编译 2023-04-21 16:30:58 +08:00
xiekaidong
4e744fa0e1 编译lua 2023-04-21 16:28:05 +08:00
chenxi
ae20156744 battle ui 2023-04-21 16:27:46 +08:00
xiekaidong
51436d26f5 引导 2023-04-21 16:14:42 +08:00
xiekaidong
9a5c8c38f9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/prefabs/ui/battle/battle_ui.prefab
2023-04-21 16:11:36 +08:00
xiekaidong
ff1da8c1b6 战斗引导 2023-04-21 16:11:13 +08:00
chenxi
8ac46b5a63 技能特效 2023-04-21 15:53:38 +08:00
befacdd446 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-21 15:06:38 +08:00