xiekaidong
|
00c9bd3bfe
|
还原资源
|
2023-09-13 10:46:12 +08:00 |
|
Fang
|
6eeff31530
|
符文功能
|
2023-09-12 10:41:44 +08:00 |
|
xiekaidong
|
29ffd0dc36
|
更新资源
|
2023-09-12 09:35:19 +08:00 |
|
xiekaidong
|
5b27f2c252
|
更新资源
|
2023-09-11 20:04:28 +08:00 |
|
xiekaidong
|
026350ff6a
|
更新资源
|
2023-09-11 14:02:28 +08:00 |
|
xiekaidong
|
c36cb3f9e5
|
资源替换
|
2023-09-09 15:09:31 +08:00 |
|
xiekaidong
|
57b1dded5f
|
资源替换
|
2023-09-09 14:06:54 +08:00 |
|
xiekaidong
|
ebbd97f8af
|
更新资源
|
2023-09-09 13:43:51 +08:00 |
|
xiekaidong
|
e936d45746
|
设置abname
|
2023-09-05 20:55:51 +08:00 |
|
xiekaidong
|
27be90073a
|
buff数值上线
|
2023-09-05 17:15:27 +08:00 |
|
xiekaidong
|
f7fe141786
|
Merge branch 'dev_20230905' into boss_rush
# Conflicts:
# Assets/arts/atlas/icon/item.asset
# Assets/arts/atlas/ui/act_common.asset
# Assets/arts/atlas/ui/act_common.asset.meta
# Assets/arts/atlas/ui/act_common.spriteatlas
# Assets/arts/atlas/ui/act_common.spriteatlas.meta
# Assets/arts/atlas/ui/common.asset
# Assets/arts/spines/ui/ui_act_boss_rush_pop.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset
# Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta
# Assets/arts/textures/icon/item/51.png.meta
# Assets/arts/textures/ui/act_common.meta
# Assets/arts/textures/ui/act_common/act_common_3.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_2.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_3.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_4.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_5.png.meta
# Assets/arts/textures/ui/act_common/act_common_bg_6.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_2.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_3.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_4.png.meta
# Assets/arts/textures/ui/act_common/act_common_board_5.png.meta
# Assets/arts/textures/ui/act_common/act_common_dec_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_line_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_line_2.png.meta
# Assets/arts/textures/ui/act_common/act_common_progress_1.png.meta
# Assets/arts/textures/ui/act_common/act_common_progress_bg.png.meta
# Assets/arts/textures/ui/act_common/act_common_select.png.meta
# Assets/arts/textures/ui/act_common/act_fourteen_dec_1.png.meta
# Assets/arts/textures/ui/act_common/act_fourteen_dec_2.png.meta
# Assets/arts/textures/ui/common/common_board_126.png.meta
# Assets/proto/protocol.bytes
|
2023-09-01 21:19:26 +08:00 |
|
Fang
|
9d6334e76e
|
新手14天乐
|
2023-09-01 15:35:31 +08:00 |
|
xiekaidong
|
81d7dc4bd0
|
资源和界面
|
2023-08-31 17:05:18 +08:00 |
|
xiekaidong
|
82b8c6a181
|
boss_rush
|
2023-08-30 19:11:51 +08:00 |
|
Fang
|
1c4236a20f
|
竞技场战令spine修改
|
2023-08-30 17:44:54 +08:00 |
|
Fang
|
cb1331708c
|
资源导入
|
2023-08-30 17:02:30 +08:00 |
|
xiekaidong
|
66bf185bd7
|
每日任务宝箱动画
|
2023-08-28 18:56:35 +08:00 |
|
Fang
|
6097fc7c7f
|
装备升级礼包
|
2023-08-24 17:29:22 +08:00 |
|
xiekaidong
|
5051d418c8
|
Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829
# Conflicts:
# Assets/arts/spines/ui/ui_herofund_banner.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner.atlas.txt.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner.png.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner.skel.bytes.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_atlas.asset
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_atlas.asset.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_material.mat
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_material.mat.meta
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_skeletondata.asset
# Assets/arts/spines/ui/ui_herofund_banner/ui_herofund_banner_skeletondata.asset.meta
# Assets/arts/spines/ui/ui_main_herofund.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.atlas.txt.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.png.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.skel.bytes
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund.skel.bytes.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_atlas.asset
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_atlas.asset.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_material.mat
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_material.mat.meta
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_skeletondata.asset
# Assets/arts/spines/ui/ui_main_herofund/ui_main_herofund_skeletondata.asset.meta
|
2023-08-23 17:37:36 +08:00 |
|
xiekaidong
|
1f6c432163
|
界面调整
|
2023-08-23 17:37:07 +08:00 |
|
Fang
|
644a3f5cc3
|
spine资源导入
|
2023-08-23 16:48:33 +08:00 |
|
xiekaidong
|
44becf62dd
|
设置abName
|
2023-08-15 21:43:21 +08:00 |
|
Fang
|
a4c6fb8e38
|
英雄生命值显示fix、资源替换
|
2023-08-14 11:15:06 +08:00 |
|
Fang
|
d8c5fb61a3
|
资源替换
|
2023-08-11 17:02:46 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
xiekaidong
|
56abe8a87b
|
添加打印
|
2023-08-09 16:03:28 +08:00 |
|
Fang
|
495b2ff5b6
|
通行证spine加背景
|
2023-08-01 10:00:08 +08:00 |
|
xiekaidong
|
0cbb46e649
|
设置adName
|
2023-07-25 22:15:06 +08:00 |
|
xiekaidong
|
2af5fb2301
|
资源检查，更新配置，编译lua，更新pb
|
2023-07-25 22:09:41 +08:00 |
|
xiekaidong
|
5b804f59f5
|
更新配置，上传资源
|
2023-07-21 17:18:21 +08:00 |
|
Fang
|
28f1271fdb
|
通行证赛季更新
|
2023-07-21 11:19:56 +08:00 |
|
xiekaidong
|
69dfb8ca23
|
支线副本
|
2023-07-20 21:47:04 +08:00 |
|
chenxi
|
dd4d99c673
|
ab name
|
2023-07-14 16:28:28 +08:00 |
|
Fang
|
6ea28967be
|
礼包入口spine、更表
|
2023-07-14 15:27:27 +08:00 |
|
xiekaidong
|
84ae5c96c6
|
出包前得资源检查和设置abName
|
2023-07-07 16:04:44 +08:00 |
|
xiekaidong
|
2a64296093
|
bug修复
|
2023-07-06 17:29:14 +08:00 |
|
xiekaidong
|
a048f7d2d9
|
编译lua
|
2023-07-06 10:42:17 +08:00 |
|
xiekaidong
|
4a76de5b95
|
竞技场弹出礼包
|
2023-07-06 10:16:03 +08:00 |
|
Fang
|
7000dff1bb
|
竞技场fix
|
2023-07-05 10:52:36 +08:00 |
|
Fang
|
007e810cf2
|
动效添加、替图
|
2023-07-03 17:17:36 +08:00 |
|
Fang
|
f8a386d933
|
ui动画、结算界面逻辑
|
2023-06-30 16:50:29 +08:00 |
|
xiekaidong
|
8e804732b5
|
替换资源
|
2023-06-30 16:10:57 +08:00 |
|
CloudJ
|
c55f297bec
|
战令替换spine
|
2023-06-29 10:42:14 +08:00 |
|
Fang
|
764645f4d5
|
逻辑补充
|
2023-06-28 18:36:07 +08:00 |
|
chenxi
|
3791c54170
|
ab name
|
2023-06-16 21:55:12 +08:00 |
|
chenxi
|
163d131603
|
更新spine
|
2023-06-16 17:38:54 +08:00 |
|
xiekaidong
|
224e3d2013
|
更新资源
|
2023-06-16 15:24:58 +08:00 |
|
xiekaidong
|
316dfbb0d8
|
更新特效
|
2023-06-16 14:07:58 +08:00 |
|
xiekaidong
|
e42970fcc0
|
资源修改
|
2023-06-15 15:17:20 +08:00 |
|
chenxi
|
c6e4978ff6
|
spine设置
|
2023-06-06 18:52:04 +08:00 |
|