42 Commits

Author SHA1 Message Date
xiekaidong
c5af661f2f 调整下战斗界面 2023-04-14 15:21:26 +08:00
xiekaidong
a442b8ffb1 战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理 2023-04-14 15:19:49 +08:00
chenxi
8c1ada2003 编译 2023-04-13 22:05:31 +08:00
xiekaidong
e448d3318d 英雄养成 2023-04-13 21:14:19 +08:00
chenxi
d469503e25 替换资源 2023-04-13 16:10:18 +08:00
xiekaidong
8a2cf4b3f1 加一个大卡片信息 2023-04-12 22:11:56 +08:00
xiekaidong
4049830098 reward显示 2023-04-12 21:46:25 +08:00
xiekaidong
2cffcebcb4 技能回收和吐出来 2023-04-12 21:03:55 +08:00
xiekaidong
707b3d2cda 处理一下主界面 2023-04-12 17:55:18 +08:00
xiekaidong
13a433d321 棋盘新的读取方式 2023-04-12 15:17:21 +08:00
chenxi
edd53e0280 编译 2023-04-11 22:46:00 +08:00
chenxi
0333974234 英雄界面spine 2023-04-11 22:45:37 +08:00
chenxi
7c3bf48beb 编译 2023-04-11 21:58:49 +08:00
chenxi
3d28196523 修复一些报错 2023-04-11 20:33:59 +08:00
chenxi
c92b1b1b9b 主界面阵容 2023-04-11 20:11:54 +08:00
chenxi
a1daf51ae1 增加一个战斗表现用节点 2023-04-11 18:27:55 +08:00
chenxi
20f87dc4de 资源 2023-04-11 18:26:10 +08:00
xiekaidong
c1ab3bc793 界面修改 2023-04-11 17:24:32 +08:00
chenxi
1163b9c827 编译 2023-04-10 21:56:12 +08:00
chenxi
4896490c00 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-04-10 21:55:49 +08:00
chenxi
fd33ffa4ae 英雄界面 2023-04-10 21:55:46 +08:00
xiekaidong
537a7a3cb1 删除测试代码 2023-04-10 21:17:33 +08:00
xiekaidong
275533f77a 编译lua 2023-04-10 21:15:07 +08:00
xiekaidong
0e32c2887b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-10 21:13:51 +08:00
xiekaidong
d6f9943820 一些技能的实现 2023-04-10 21:13:47 +08:00
chenxi
e5087ad232 c# 2023-04-10 17:09:31 +08:00
xiekaidong
9ec8b4b4a0 技能生成规则 2023-04-10 17:03:48 +08:00
xiekaidong
b9693466c1 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-10 09:59:17 +08:00
xiekaidong
1faea130b5 界面 2023-04-10 09:59:14 +08:00
chenxi
675ca6a783 英雄列表 2023-04-08 17:53:02 +08:00
chenxi
468ded50d3 编译 2023-04-07 22:23:28 +08:00
chenxi
5c05e888c9 章节 2023-04-07 20:50:58 +08:00
xiekaidong
7006d7c283 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/atlas/ui/battle.spriteatlas
2023-04-07 15:32:24 +08:00
xiekaidong
1965bc4c98 消除逻辑调整一下 2023-04-07 15:31:46 +08:00
chenxi
4809253845 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/textures/ui/common.meta
#	Assets/arts/textures/ui/common/common_alpha.png.meta
#	Assets/arts/textures/ui/common/common_arrow_3.png
#	Assets/arts/textures/ui/common/common_arrow_3.png.meta
#	Assets/arts/textures/ui/common/common_arrow_4.png
#	Assets/arts/textures/ui/common/common_arrow_4.png.meta
#	Assets/arts/textures/ui/common/common_bg_0.png.meta
#	Assets/arts/textures/ui/common/common_bg_3.png
#	Assets/arts/textures/ui/common/common_bg_3.png.meta
#	Assets/arts/textures/ui/common/common_board_10.png
#	Assets/arts/textures/ui/common/common_board_10.png.meta
#	Assets/arts/textures/ui/common/common_board_6.png
#	Assets/arts/textures/ui/common/common_board_6.png.meta
#	Assets/arts/textures/ui/common/common_board_7.png
#	Assets/arts/textures/ui/common/common_board_7.png.meta
#	Assets/arts/textures/ui/common/common_btn_2.png
#	Assets/arts/textures/ui/common/common_btn_2.png.meta
#	Assets/arts/textures/ui/common/common_btn_3.png
#	Assets/arts/textures/ui/common/common_btn_3.png.meta
#	Assets/arts/textures/ui/common/common_check_1.png
#	Assets/arts/textures/ui/common/common_check_1.png.meta
#	Assets/arts/textures/ui/common/common_chest_1.png
#	Assets/arts/textures/ui/common/common_chest_1.png.meta
#	Assets/arts/textures/ui/common/common_dec_1.png
#	Assets/arts/textures/ui/common/common_dec_1.png.meta
#	Assets/arts/textures/ui/common/common_hp.png
#	Assets/arts/textures/ui/common/common_hp.png.meta
#	Assets/arts/textures/ui/common/common_inf.png
#	Assets/arts/textures/ui/common/common_inf.png.meta
#	Assets/arts/textures/ui/common/common_lock_2.png
#	Assets/arts/textures/ui/common/common_lock_2.png.meta
#	Assets/arts/textures/ui/common/common_progress_4.png
#	Assets/arts/textures/ui/common/common_progress_4.png.meta
2023-04-07 15:27:09 +08:00
chenxi
f2ba5705ef ui 2023-04-07 15:24:16 +08:00
xiekaidong
5208536497 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-04-07 11:24:10 +08:00
xiekaidong
28d9843708 棋盘 2023-04-07 11:24:06 +08:00
chenxi
ee3a54f07e 修改一下product name 2023-04-06 11:04:26 +08:00
xiekaidong
e6ecab4ee4 棋盘 2023-04-06 10:39:26 +08:00
xiekaidong
87af2478d9 整理项目 2023-04-03 11:04:31 +08:00
chenxi
6de0517da3 first commit 2023-04-03 10:47:44 +08:00