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 |
|