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

98 Commits

Author SHA1 Message Date
xiekaidong
edfc1d0b46 修复 2023-09-19 11:20:59 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
ac9253f074 编译lua 2023-09-05 17:36:54 +08:00
xiekaidong
ea75430a03 bug修复 2023-09-05 15:28:33 +08:00
xiekaidong
68614b6ba8 bug修复 2023-09-05 10:06:59 +08:00
xiekaidong
e4aa6e2edd 更新配置 2023-09-01 21:21:02 +08:00
Fang
9d6334e76e 新手14天乐 2023-09-01 15:35:31 +08:00
Fang
332789283b 点击英雄卡面，不显示皮肤fix 2023-08-31 18:10:26 +08:00
Fang
667e9dbe11 更换皮肤卡面变化 2023-08-30 17:32:14 +08:00
Fang
79f1369068 加载资源优化 2023-08-29 17:11:49 +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
Fang
eeae9e8382 段位奖励添加奖励光效 2023-08-28 17:42:13 +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
3ace779c74 一些优化和容错 2023-08-18 10:56:29 +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
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
Fang
d3dbfd0b51 1、材料本扫荡后次数刷新不及时fix 2、装备副本扫荡触发礼包未立即弹出fix 2023-08-09 10:20:31 +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
3b182e56c5 英雄竞技场段位解锁 2023-08-03 18:08:02 +08:00
Fang
644e83d710 道具获取的头像品质颜色错误fix 2023-08-01 10:28:55 +08:00
Fang
a8b82718d0 1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值3、修改副本入口命名 2023-07-28 18:05:35 +08:00
Fang
be4846e7b9 抽卡界面不展示装备升级红点 2023-07-28 12:05:53 +08:00
xiekaidong
fb4140d219 增加容错 2023-07-28 10:49:49 +08:00
Fang
75e63b9685 红点修改 2023-07-27 12:03:11 +08:00
Fang
9bc06371fb 编译 2023-07-26 18:23:37 +08:00
Fang
e31bf25fa3 装备红点、文案 2023-07-26 15:16:01 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
Fang
8506550027 拼写错误fix 2023-07-25 20:28:49 +08:00
Fang
f821a6e6d1 显示fix 2023-07-24 21:39:48 +08:00
Fang
60652a2829 防具升级显示的增加绿色数值不计算加成百分比、扫荡界面奖励动画、武器漂浮动画 2023-07-24 21:07:54 +08:00
Fang
7879d441bd 道具获取扫荡文案修改、武器界面加anim组件 2023-07-24 15:59:13 +08:00
xiekaidong
66d69032e6 英雄属性bug修复，查看其他玩家信息时带入装备信息 2023-07-22 18:16:26 +08:00
Fang
02da483630 装备升级材料获取 2023-07-21 09:51:28 +08:00
xiekaidong
61336e5d6c 编译lua 2023-07-19 20:24:13 +08:00
xiekaidong
1107b0831d 竞技场匹配阵容提示优化 2023-07-10 15:39:59 +08:00
xiekaidong
c79d0eebae 二确认弹窗修复 2023-07-07 16:10:14 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
Fang
44ee6c0d52 添加头像、头像框道具解锁逻辑 2023-07-07 11:05:29 +08:00
xiekaidong
6ac555593c 引导处理一下 2023-07-05 21:59:04 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
chenxi
622d9918d3 ab name 2023-06-20 14:32:36 +08:00
Fang
0d624772e7 添加头像背景品质 2023-06-20 14:23:48 +08:00
Fang
ccd4276e6f 英雄编队拆分出来 2023-06-20 11:08:11 +08:00
Fang
7939d1630d 跨天关闭副本关卡选择界面 2023-06-19 16:00:11 +08:00