xiekaidong
|
8ec159b939
|
侧边栏
|
2023-09-04 16:07:07 +08:00 |
|
xiekaidong
|
c15bf48f06
|
图集，资源修改
|
2023-09-04 09:46:55 +08:00 |
|
xiekaidong
|
e4aa6e2edd
|
更新配置
|
2023-09-01 21:21:02 +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 |
|
xiekaidong
|
f0889cb678
|
首领公开赛
|
2023-09-01 21:10:25 +08:00 |
|
Fang
|
2877a0418f
|
bug fix
|
2023-09-01 18:35:56 +08:00 |
|
陈希
|
b67cd42d94
|
Merge branch 'fang/14天乐' into 'dev_20230905'
新手14天乐
See merge request b6-client/b6-unity!16
|
2023-09-01 09:46:07 +00:00 |
|
Fang
|
c04ae2e751
|
review
|
2023-09-01 17:45:52 +08:00 |
|
Fang
|
9d1d98ddd5
|
代码调整
|
2023-09-01 15:59:20 +08:00 |
|
Fang
|
9d6334e76e
|
新手14天乐
|
2023-09-01 15:35:31 +08:00 |
|
xiekaidong
|
b9ee339355
|
界面调整
|
2023-08-31 20:18:23 +08:00 |
|
Fang
|
332789283b
|
点击英雄卡面，不显示皮肤fix
|
2023-08-31 18:10:26 +08:00 |
|
Fang
|
afc6b61916
|
导入头像资源
|
2023-08-31 18:05:18 +08:00 |
|
xiekaidong
|
81d7dc4bd0
|
资源和界面
|
2023-08-31 17:05:18 +08:00 |
|
xiekaidong
|
cc21b09f91
|
设置abname，提升版本号
v.1.2.6_android
v.1.3.6_ios
|
2023-08-30 19:21:13 +08:00 |
|
xiekaidong
|
0b8306ff1b
|
更新配置
|
2023-08-30 19:16:24 +08:00 |
|
xiekaidong
|
82b8c6a181
|
boss_rush
|
2023-08-30 19:11:51 +08:00 |
|
Fang
|
7d0f23df51
|
竞技场入口banner修改
|
2023-08-30 18:13:05 +08:00 |
|
Fang
|
1c4236a20f
|
竞技场战令spine修改
|
2023-08-30 17:44:54 +08:00 |
|
Fang
|
667e9dbe11
|
更换皮肤卡面变化
|
2023-08-30 17:32:14 +08:00 |
|
Fang
|
71fe08b57c
|
更表
|
2023-08-30 17:04:14 +08:00 |
|
Fang
|
cb1331708c
|
资源导入
|
2023-08-30 17:02:30 +08:00 |
|
xiekaidong
|
b188be5dd4
|
提升版本号
v.1.2.5_android
v.1.3.5_ios
|
2023-08-29 21:42:21 +08:00 |
|
xiekaidong
|
f08af571e2
|
Merge branch 'dev_20230829'
|
2023-08-29 21:41:35 +08:00 |
|
xiekaidong
|
b3b9e59f4a
|
优化
|
2023-08-29 21:32:29 +08:00 |
|
xiekaidong
|
cd1cea12fa
|
bug修复
|
2023-08-29 21:04:37 +08:00 |
|
xiekaidong
|
3a690240f9
|
首领入侵活动界面
|
2023-08-29 19:03:40 +08:00 |
|
xiekaidong
|
1dbe2391dc
|
提升版本号
v.1.2.4_android
v.1.3.4_ios
|
2023-08-29 17:17:25 +08:00 |
|
Fang
|
79f1369068
|
加载资源优化
|
2023-08-29 17:11:49 +08:00 |
|
xiekaidong
|
1daeabac42
|
编译lua
|
2023-08-29 16:03:47 +08:00 |
|
xiekaidong
|
eb1a197cc0
|
Merge branch 'master' into dev_20230829
# Conflicts:
# Assets/lua/app/config/skill_rogue.lua.bytes
# Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
|
2023-08-29 16:02:44 +08:00 |
|
xiekaidong
|
4e0cd6c8d8
|
更新资源
|
2023-08-29 14:57:22 +08:00 |
|
xiekaidong
|
67a46e7d06
|
增加容错
|
2023-08-29 14:55:13 +08:00 |
|
xiekaidong
|
f2b6ce6233
|
资源异常处理
|
2023-08-29 12:32:13 +08:00 |
|
xiekaidong
|
44d66bb6c2
|
资源检查
|
2023-08-29 12:23:18 +08:00 |
|
xiekaidong
|
df29ad47ea
|
更新配置
|
2023-08-29 12:22:26 +08:00 |
|
xiekaidong
|
3c50b60ccd
|
珊瑚特效
|
2023-08-29 11:27:04 +08:00 |
|
xiekaidong
|
2ac1249b99
|
更新协议
|
2023-08-29 11:03:54 +08:00 |
|
xiekaidong
|
a8a49eeb86
|
网络模块优化
|
2023-08-29 11:02:11 +08:00 |
|
xiekaidong
|
a6665b8fc3
|
bug修复
|
2023-08-28 19:15:19 +08:00 |
|
xiekaidong
|
7722e968e3
|
逻辑调整
|
2023-08-28 19:12:19 +08:00 |
|
xiekaidong
|
66bf185bd7
|
每日任务宝箱动画
|
2023-08-28 18:56:35 +08:00 |
|
xiekaidong
|
6533c64892
|
Merge branch 'dev_20230829' of http://git.juzugame.com/b6-client/b6-unity into dev_20230829
|
2023-08-28 18:36:19 +08:00 |
|
xiekaidong
|
b5c144a98e
|
显示修复
|
2023-08-28 18:36:15 +08:00 |
|
Fang
|
ec67afe68b
|
竞技场入口红点添加段位奖励可领取情况
|
2023-08-28 18:19:26 +08:00 |
|
Fang
|
c1af1c8dcf
|
段位奖励第一个档位标签显示fix
|
2023-08-28 17:51:20 +08:00 |
|
Fang
|
eeae9e8382
|
段位奖励添加奖励光效
|
2023-08-28 17:42:13 +08:00 |
|
Fang
|
7f99b9d771
|
装备礼包fix
|
2023-08-28 15:26:21 +08:00 |
|
xiekaidong
|
dccabf26e2
|
bug修复
|
2023-08-28 15:16:30 +08:00 |
|
xiekaidong
|
f470bacdbb
|
调整一下填充和格子效果的逻辑顺序
|
2023-08-28 14:50:44 +08:00 |
|