xiekaidong
|
fb4140d219
|
增加容错
|
2023-07-28 10:49:49 +08:00 |
|
xiekaidong
|
c8e1980dac
|
编译lua
|
2023-07-07 17:20:00 +08:00 |
|
xiekaidong
|
07c8ef8648
|
Merge branch 'master' into dev
# Conflicts:
# Assets/Editor/JenkinsAdapter.cs
# Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
# Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
|
2023-07-07 17:14:54 +08:00 |
|
Fang
|
007e810cf2
|
动效添加、替图
|
2023-07-03 17:17:36 +08:00 |
|
xiekaidong
|
8231fc3cc5
|
添加容错
|
2023-06-25 10:31:05 +08:00 |
|
xiekaidong
|
06191c7e8c
|
bug修复
|
2023-06-21 17:16:12 +08:00 |
|
xiekaidong
|
62f45a0392
|
战斗支持血量换皮肤
|
2023-06-15 18:56:07 +08:00 |
|
chenxi
|
9a169f666e
|
侧边栏优化
|
2023-06-05 16:24:28 +08:00 |
|
xiekaidong
|
b60f9b1ca4
|
boss机制棋盘效果处理
|
2023-06-02 22:28:55 +08:00 |
|
xiekaidong
|
c65d52c8de
|
水泡动画
|
2023-06-02 19:02:18 +08:00 |
|
Fang
|
5356a92634
|
功能解锁飞行动画
|
2023-06-02 18:36:05 +08:00 |
|
chenxi
|
3e3d1670f1
|
侧边栏spine
|
2023-06-01 15:05:35 +08:00 |
|
chenxi
|
18bbe0108f
|
编译
|
2023-06-01 11:14:34 +08:00 |
|
xiekaidong
|
7e25cb28cb
|
三消格子支持spine动画表现
|
2023-05-31 20:18:57 +08:00 |
|
xiekaidong
|
29a8e59133
|
编译lua
|
2023-05-30 17:50:23 +08:00 |
|
xiekaidong
|
c3e7ea9272
|
bug修复
|
2023-05-26 15:58:40 +08:00 |
|
chenxi
|
3b60a301a4
|
战令重复奖励
|
2023-05-16 22:03:22 +08:00 |
|
chenxi
|
e5cf6e09bf
|
战令
|
2023-05-15 21:34:02 +08:00 |
|
chenxi
|
c3a6dcbf7c
|
商城
|
2023-05-15 10:43:49 +08:00 |
|
chenxi
|
1e6eac90fb
|
编译
|
2023-05-08 09:44:06 +08:00 |
|
xiekaidong
|
a849c21af9
|
一些spine
|
2023-04-24 15:50:14 +08:00 |
|
chenxi
|
8ac46b5a63
|
技能特效
|
2023-04-21 15:53:38 +08:00 |
|
chenxi
|
5c8964148d
|
编译
|
2023-04-18 16:06:08 +08:00 |
|
chenxi
|
e9cf5af678
|
援助攻击
|
2023-04-17 22:11:09 +08:00 |
|
chenxi
|
8c1ada2003
|
编译
|
2023-04-13 22:05:31 +08:00 |
|
chenxi
|
edd53e0280
|
编译
|
2023-04-11 22:46:00 +08:00 |
|
chenxi
|
3d28196523
|
修复一些报错
|
2023-04-11 20:33:59 +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 |
|
xiekaidong
|
87af2478d9
|
整理项目
|
2023-04-03 11:04:31 +08:00 |
|