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

862 Commits

Author SHA1 Message Date
Fang
be98aa91d8 段位奖励展示修改、添加收集标签红点 2023-08-24 18:09:55 +08:00
Fang
6097fc7c7f 装备升级礼包 2023-08-24 17:29:22 +08:00
xiekaidong
7b7ee7aa0c 容错 2023-08-24 14:30:53 +08:00
xiekaidong
d716440747 界面处理 2023-08-23 17:46:57 +08:00
xiekaidong
1f6c432163 界面调整 2023-08-23 17:37:07 +08:00
xiekaidong
e4df3deb60 提升版本号 2023-08-21 16:02:56 +08:00
Fang
ad82aba16d 连续快速扫荡显示fix 2023-08-21 14:55:22 +08:00
Fang
20aa364195 连续快速扫荡显示fix 2023-08-21 14:38:25 +08:00
xiekaidong
7134e96cc8 Merge branch 'master' into dev_20230829 
# Conflicts:
#	Assets/lua/app/common/event_manager.lua.bytes
#	Assets/lua/app/proto/proto_msg_type.lua.bytes
#	Assets/proto/protocol.bytes
 2023-08-21 09:47:38 +08:00
xiekaidong
deae480ef3 诅咒回血被腐败影响 2023-08-18 18:56:09 +08:00
xiekaidong
6441196517 一些描述 2023-08-18 18:36:08 +08:00
xiekaidong
033c2e8d63 英雄基金 2023-08-18 18:10:12 +08:00
xiekaidong
3ace779c74 一些优化和容错 2023-08-18 10:56:29 +08:00
Fang
0a5e37baa3 优化夏日活动请求 2023-08-17 14:06:58 +08:00
xiekaidong
60a2c2ee3a 战令一键领取 2023-08-16 17:36:18 +08:00
xiekaidong
3bcb923eda 层级调整 2023-08-16 11:28:22 +08:00
xiekaidong
44becf62dd 设置abName 2023-08-15 21:43:21 +08:00
xiekaidong
c597e71285 优化 2023-08-15 19:41:11 +08:00
xiekaidong
4b49a99d8f 容错和容错 2023-08-15 19:34:30 +08:00
xiekaidong
6d480fc8b7 更新配置 2023-08-15 18:43:01 +08:00
Fang
3b4a03cde8 多语言遮挡处理 2023-08-15 16:17:49 +08:00
Fang
be4c77474e 显示fix 2023-08-15 15:35:02 +08:00
Fang
acf5e29ae1 bug fix 2023-08-15 15:08:35 +08:00
Fang
335ab77238 竞技场皮肤属性完善 2023-08-15 12:20:55 +08:00
Fang
ea1d84b065 编译 2023-08-15 11:37:54 +08:00
Fang
212c93632b 活动等级达到最大报错fix 2023-08-15 10:28:42 +08:00
Fang
f788462596 皮肤道具点开界面 2023-08-14 19:35:04 +08:00
xiekaidong
cbce761a98 竞技场弹出礼包界面 2023-08-14 14:52:58 +08:00
Fang
a4c6fb8e38 英雄生命值显示fix、资源替换 2023-08-14 11:15:06 +08:00
Fang
7dd9c5e88a 夏日活动战令购买spine动画调换 2023-08-14 09:58:52 +08:00
Fang
d8c5fb61a3 资源替换 2023-08-11 17:02:46 +08:00
Fang
78fac50fc5 装备副本界面添加礼包入口 2023-08-11 16:35:21 +08:00
Fang
30bf431636 编译 2023-08-11 16:03:20 +08:00
Fang
302452e76d 竞技场宝箱弹出优化、bugfix 2023-08-11 15:50:38 +08:00
Fang
d88a18d48b 活动礼包弹出逻辑补充 2023-08-11 15:09:15 +08:00
Fang
0fda6326b4 编译 2023-08-11 14:28:01 +08:00
Fang
51891b4d27 夏日活动功能 2023-08-11 12:00:11 +08:00
xiekaidong
b08ab375cc bug修复 2023-08-10 19:29:42 +08:00
Fang
1aef3a423a 皮肤属性增加生命加成显示 2023-08-10 16:32:10 +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
Fang
704fc389cb 替图、编译 2023-08-09 16:48:39 +08:00
xiekaidong
56abe8a87b 添加打印 2023-08-09 16:03:28 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
xiekaidong
bcb726187e bug修复 2023-08-09 10:26:58 +08:00
xiekaidong
519bda505a 金猪 2023-08-09 10:21:52 +08:00
Fang
d3dbfd0b51 1、材料本扫荡后次数刷新不及时fix 2、装备副本扫荡触发礼包未立即弹出fix 2023-08-09 10:20:31 +08:00
xiekaidong
cb2c2669c2 bug修复 2023-08-08 18:10:34 +08:00
xiekaidong
ce7ad3cb8c 新buff和新机制 2023-08-08 16:39:03 +08:00
xiekaidong
433ec88ba1 编译lua 2023-08-08 16:00:08 +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