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

829 Commits

Author SHA1 Message Date
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
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
xiekaidong
654a94eab9 编译lua 2023-08-07 15:33:52 +08:00
xiekaidong
f52b02b929 优化显示 2023-08-07 09:37:13 +08:00
Fang
8e8320a307 礼包界面展示冲突处理 2023-08-04 16:00:17 +08:00
Fang
e79f3ea767 装备材料副本扫荡排序修改 2023-08-04 10:53:22 +08:00
xiekaidong
3b182e56c5 英雄竞技场段位解锁 2023-08-03 18:08:02 +08:00
xiekaidong
80bb50137a bug修复 2023-08-03 16:53:57 +08:00
xiekaidong
cd5f588a66 统一接口，金币不足提示弹窗询问 2023-08-03 14:54:55 +08:00
xiekaidong
8be0258270 日志上报 2023-08-03 14:20:41 +08:00
xiekaidong
8de4c3340b 武器副本增加体力消耗 2023-08-03 11:08:40 +08:00
xiekaidong
d24f52825e Merge branch 'dev_20230809' of http://git.juzugame.com/b6-client/b6-unity into dev_20230809 2023-08-03 10:24:48 +08:00
xiekaidong
d312e42fac 优化局内技能显示 2023-08-03 10:24:45 +08:00
Fang
6fabe5b071 资源副本扫荡不关闭关卡界面 2023-08-03 10:09:36 +08:00
xiekaidong
93bd2796b6 战斗血条优化 2023-08-02 20:34:37 +08:00
xiekaidong
7b8177d69e 优化显示 2023-08-02 18:56:50 +08:00
xiekaidong
32e93ec980 木棍边缘障碍物 2023-08-02 18:10:43 +08:00
xiekaidong
999d62cdbd bug修复 2023-08-01 18:21:00 +08:00
Fang
694f7eb10b 增加优惠入口红点逻辑 2023-08-01 18:20:08 +08:00
xiekaidong
31a57fddc6 技能机制优化 2023-08-01 17:39:15 +08:00
Fang
4749c1a7e4 道具获取的头像品质颜色错误fix、防具升级刷新不及时fix 2023-08-01 17:16:18 +08:00
Fang
fcba09b85b 装备副本材料获取界面排序 2023-08-01 16:44:29 +08:00
Fang
257a21b81b 防具升级刷新不及时fix 2023-08-01 14:46:13 +08:00
Fang
6f13ff7f87 添加音效 2023-08-01 11:11:29 +08:00
Fang
644e83d710 道具获取的头像品质颜色错误fix 2023-08-01 10:28:55 +08:00
xiekaidong
dfb2714266 更新配置 2023-07-31 16:28:15 +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
23c7b3ed55 超框 2023-07-31 10:06:51 +08:00
Fang
7e2113df1c 支线基金奖励领取按钮文案修改 2023-07-31 09:57:34 +08:00
xiekaidong
9a3549ad43 引导修改 2023-07-28 18:40:31 +08:00
Fang
a8b82718d0 1、抽卡界面不展示装备升级红点2、英雄未解锁时显示初始数值3、修改副本入口命名 2023-07-28 18:05:35 +08:00
Fang
446b417948 英雄未解锁时显示初始数值 2023-07-28 15:35:54 +08:00
Fang
be4846e7b9 抽卡界面不展示装备升级红点 2023-07-28 12:05:53 +08:00
Fang
74dec91e6d 技能tips 2023-07-28 11:46:58 +08:00