puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,244 Commits 8 Branches 95 Tags
Commit Graph

780 Commits

Author SHA1 Message Date
Fang
7837455596 竞技场段位奖励 2023-08-23 14:41:56 +08:00
xiekaidong
6441196517 一些描述 2023-08-18 18:36:08 +08:00
xiekaidong
02481f50b4 英雄基金 2023-08-18 18:08:58 +08:00
xiekaidong
cd3a75c78f 英雄基金 2023-08-18 11:38:26 +08:00
xiekaidong
f8c3dc9bb0 界面和协议 2023-08-17 18:15:39 +08:00
xiekaidong
81f6b85711 界面 2023-08-16 18:08:49 +08:00
xiekaidong
60a2c2ee3a 战令一键领取 2023-08-16 17:36:18 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
Fang
1e7440d170 夏日活动上报 2023-08-15 20:32:37 +08:00
xiekaidong
a645eb5c63 层级调整 2023-08-15 20:30:21 +08:00
xiekaidong
3527846c69 资源检查 2023-08-15 19:51:06 +08:00
xiekaidong
c597e71285 优化 2023-08-15 19:41:11 +08:00
xiekaidong
db2c20f2f1 适配 2023-08-15 17:42:22 +08:00
Fang
3b4a03cde8 多语言遮挡处理 2023-08-15 16:17:49 +08:00
Fang
be4c77474e 显示fix 2023-08-15 15:35:02 +08:00
xiekaidong
4d1635dc3b 背景特效 2023-08-15 14:59:48 +08:00
Fang
f788462596 皮肤道具点开界面 2023-08-14 19:35:04 +08:00
xiekaidong
cc6508dc20 金猪界面 2023-08-14 14:54:21 +08:00
Fang
0aba4ec004 更表 2023-08-14 09:50:16 +08:00
Fang
d8c5fb61a3 资源替换 2023-08-11 17:02:46 +08:00
Fang
78fac50fc5 装备副本界面添加礼包入口 2023-08-11 16:35:21 +08:00
Fang
302452e76d 竞技场宝箱弹出优化、bugfix 2023-08-11 15:50:38 +08:00
Fang
51891b4d27 夏日活动功能 2023-08-11 12:00:11 +08:00
xiekaidong
977b3c8c91 Merge branch 'master' into dev_20230815 
# Conflicts:
#	Assets/lua/app/config/arena_bounty_level.lua.bytes
#	Assets/lua/app/config/arena_rank.lua.bytes
#	Assets/lua/app/config/avatar_frame.lua.bytes
#	Assets/lua/app/config/chapter.lua.bytes
#	Assets/lua/app/config/chapter_board.lua.bytes
#	Assets/lua/app/config/grid_type.lua.bytes
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/monster_chapter.lua.bytes
#	Assets/lua/app/config/monster_daily_challenge.lua.bytes
#	Assets/lua/app/config/monster_dungeon_armor.lua.bytes
#	Assets/lua/app/config/strings/cn/avatar.lua.bytes
#	Assets/lua/app/config/strings/cn/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/cn/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/en/avatar.lua.bytes
#	Assets/lua/app/config/strings/en/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/en/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/es/avatar.lua.bytes
#	Assets/lua/app/config/strings/es/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/es/item.lua.bytes
#	Assets/lua/app/config/strings/es/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/id/avatar.lua.bytes
#	Assets/lua/app/config/strings/id/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/id/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/ja/avatar.lua.bytes
#	Assets/lua/app/config/strings/ja/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ja/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/ko/avatar.lua.bytes
#	Assets/lua/app/config/strings/ko/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/ko/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/pt/avatar.lua.bytes
#	Assets/lua/app/config/strings/pt/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/pt/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/th/avatar.lua.bytes
#	Assets/lua/app/config/strings/th/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/th/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/vi/avatar.lua.bytes
#	Assets/lua/app/config/strings/vi/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/vi/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/zh/avatar.lua.bytes
#	Assets/lua/app/config/strings/zh/avatar_frame.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/config/strings/zh/skill_rogue.lua.bytes
#	Assets/lua/app/config/summon.lua.bytes
#	Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes
#	Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
#	Assets/lua/app/module/battle/team/battle_team.lua.bytes
#	Assets/lua/app/module/shop/shop_manager.lua.bytes
 2023-08-10 09:38:07 +08:00
xiekaidong
f0c490b2ca 资源检查 2023-08-09 17:00:39 +08:00
xiekaidong
56abe8a87b 添加打印 2023-08-09 16:03:28 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
xiekaidong
519bda505a 金猪 2023-08-09 10:21:52 +08:00
xiekaidong
5caf199eb1 Merge branch 'dev_20230815' into battle 2023-08-08 16:00:24 +08:00
xiekaidong
3b61c03934 Merge branch 'dev_20230809' into dev_20230815 
# Conflicts:
#	Assets/lua/app/common/local_data.lua.bytes
#	Assets/lua/app/config/act_gift.lua.bytes
#	Assets/lua/app/config/arena_rank.lua.bytes
#	Assets/lua/app/config/chapter_board.lua.bytes
#	Assets/lua/app/config/const.lua.bytes
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/skill_rogue.lua.bytes
#	Assets/lua/app/config/strings/cn/buff.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/es/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ja/skill.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/config/strings/zh/skill.lua.bytes
#	Assets/lua/app/global/global_func.lua.bytes
#	Assets/lua/app/module/arena/arena_manager.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/module/battle/helper/battle_snapshot_helper.lua.bytes
#	Assets/lua/app/module/equip/equip_manager.lua.bytes
#	Assets/lua/app/module/shop/shop_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/lua/app/ui/battle/battle_base_ui.lua.bytes
#	Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
#	Assets/lua/app/ui/ui_manager.lua.bytes
#	Assets/proto/protocol.bytes
 2023-08-08 15:59:22 +08:00
xiekaidong
387492bd3b 显示调整 2023-08-07 17:21:55 +08:00
xiekaidong
8de4c3340b 武器副本增加体力消耗 2023-08-03 11:08:40 +08:00
xiekaidong
d312e42fac 优化局内技能显示 2023-08-03 10:24:45 +08:00
xiekaidong
410cc6b903 优化显示逻辑 2023-08-02 18:47:41 +08:00
xiekaidong
a199c25d16 木棍边缘障碍物 2023-08-02 18:07:58 +08:00
Fang
70ab6525f1 礼包布局显示fix 2023-08-01 11:37:12 +08:00
xiekaidong
5e81a3a03c Merge branch 'master' into dev_20230809 
# Conflicts:
#	Assets/lua/app/ui/hero/hero_info_comp.lua.bytes
#	Assets/lua/app/userdata/hero/hero_entity.lua.bytes
 2023-07-31 16:23:57 +08:00
Fang
0559fd514f 超框 2023-07-31 11:17:39 +08:00
xiekaidong
4f2afb81f4 Merge branch 'dev_20230731_hotupdate' of http://git.juzugame.com/b6-client/b6-unity into dev_20230731_hotupdate 2023-07-31 10:15:28 +08:00
xiekaidong
8a39baf5f7 界面对齐方式修改 2023-07-31 10:11:03 +08:00
Fang
23c7b3ed55 超框 2023-07-31 10:06:51 +08:00
Fang
69b6eaa5b9 超框 2023-07-31 10:01:59 +08:00
Fang
74dec91e6d 技能tips 2023-07-28 11:46:58 +08:00
xiekaidong
b74826ee90 更新配置 2023-07-27 10:28:08 +08:00
Fang
e31bf25fa3 装备红点、文案 2023-07-26 15:16:01 +08:00
xiekaidong
57867145a4 显示优化 2023-07-26 11:48:07 +08:00
Fang
654c34d0b6 动效、fix 2023-07-25 22:35:04 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
2104d20eed 资源检查 2023-07-25 22:06:48 +08:00
xiekaidong
728cea36a5 Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-unity into dev_20230725 2023-07-25 21:07:19 +08:00