puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_unity/Assets/lua/app/ui/main_city/cell
History
xiekaidong d43dd92f9e Merge branch 'master' into dev_20230809 
# Conflicts:
#	Assets/lua/app/common/bi_report.lua.bytes
#	Assets/lua/app/config/grid_type.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/ui/hero/armor_info_comp.lua.bytes
#	Assets/lua/app/userdata/dungeon/dungeon_armor_entity.lua.bytes
#	Assets/lua/app/userdata/player/player_data.lua.bytes
#	Assets/lua/app/userdata/shop/shop_data.lua.bytes
2023-08-08 11:42:31 +08:00
..
bottom_btn_cell.lua.bytes
编译
2023-07-07 15:41:04 +08:00
bottom_btn_cell.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
side_bar_arena_gift_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_arena_gift_cell.lua.bytes.meta
出包前得资源检查和设置abName
2023-07-07 16:04:44 +08:00
side_bar_armor_gift_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_armor_gift_cell.lua.bytes.meta
设置adName
2023-07-25 22:15:06 +08:00
side_bar_base_cell.lua.bytes
merge
2023-06-13 10:45:07 +08:00
side_bar_base_cell.lua.bytes.meta
整理项目
2023-04-03 11:04:31 +08:00
side_bar_beginner_gift_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_beginner_gift_cell.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
side_bar_discount_cell.lua.bytes
增加优惠入口红点逻辑
2023-08-01 18:20:08 +08:00
side_bar_discount_cell.lua.bytes.meta
ab name
2023-07-14 16:28:28 +08:00
side_bar_first_recharge_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_first_recharge_cell.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
side_bar_gm_cell.lua.bytes
主城
2023-05-05 22:05:13 +08:00
side_bar_gm_cell.lua.bytes.meta
删除多余的
2023-05-08 20:08:45 +08:00
side_bar_gold_pig_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_gold_pig_cell.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
side_bar_grow_up_gift_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_grow_up_gift_cell.lua.bytes.meta
出包前得资源检查和设置abName
2023-07-07 16:04:44 +08:00
side_bar_growth_fund_cell.lua.bytes
编译
2023-06-05 17:25:21 +08:00
side_bar_growth_fund_cell.lua.bytes.meta
ab name
2023-05-30 21:15:29 +08:00
side_bar_idle_cell.lua.bytes
merge
2023-06-13 10:45:07 +08:00
side_bar_idle_cell.lua.bytes.meta
删除多余的
2023-05-08 20:08:45 +08:00
side_bar_introduct_gift_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_introduct_gift_cell.lua.bytes.meta
出包前得资源检查和设置abName
2023-07-07 16:04:44 +08:00
side_bar_seven_days_cell.lua.bytes
merge
2023-06-13 10:45:07 +08:00
side_bar_seven_days_cell.lua.bytes.meta
删除多余的
2023-05-08 20:08:45 +08:00
side_bar_weapon_gift_cell.lua.bytes
日志上报
2023-08-03 14:20:41 +08:00
side_bar_weapon_gift_cell.lua.bytes.meta
设置adName
2023-07-25 22:15:06 +08:00