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

377 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
425bfe2fd7 更新配置 2023-08-11 10:41:28 +08:00
xiekaidong
b08ab375cc bug修复 2023-08-10 19:29:42 +08:00
xiekaidong
53e9da7a4f 皮肤技能表现 2023-08-10 10:49:22 +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
591784bef1 更表 2023-08-09 17:25:52 +08:00
Fang
9c9cde6a89 皮肤功能 2023-08-09 14:15:12 +08:00
Fang
a6288069d8 装备礼包弹出fix 2023-08-09 10:58:45 +08:00
xiekaidong
519bda505a 金猪 2023-08-09 10:21:52 +08:00
xiekaidong
ce7ad3cb8c 新buff和新机制 2023-08-08 16:39:03 +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
dff0b5b08a 更新配置 2023-08-08 11:44:40 +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
bad1e2f2e6 新增上报 2023-08-07 18:15:55 +08:00
xiekaidong
607c8d3eb6 增加上报属性 2023-08-07 10:35:37 +08:00
xiekaidong
d26fe6cfa2 显示修复 2023-08-04 15:17:46 +08:00
xiekaidong
a8064bb578 棋盘机制调整 2023-08-04 14:24:13 +08:00
xiekaidong
a108907fe1 显示bug修复 2023-08-04 11:34:10 +08:00
xiekaidong
5817c99a36 付费项上报异常问题修复 2023-08-03 18:10:48 +08:00
xiekaidong
3b182e56c5 英雄竞技场段位解锁 2023-08-03 18:08:02 +08:00
xiekaidong
80bb50137a bug修复 2023-08-03 16:53:57 +08:00
xiekaidong
8be0258270 日志上报 2023-08-03 14:20:41 +08:00
xiekaidong
8de4c3340b 武器副本增加体力消耗 2023-08-03 11:08:40 +08:00
xiekaidong
856132179a 显示bug修复 2023-08-03 09:47:41 +08:00
xiekaidong
410cc6b903 优化显示逻辑 2023-08-02 18:47:41 +08:00
xiekaidong
32e93ec980 木棍边缘障碍物 2023-08-02 18:10:43 +08:00
Fang
694f7eb10b 增加优惠入口红点逻辑 2023-08-01 18:20:08 +08:00
Fang
4749c1a7e4 道具获取的头像品质颜色错误fix、防具升级刷新不及时fix 2023-08-01 17:16:18 +08:00
Fang
644e83d710 道具获取的头像品质颜色错误fix 2023-08-01 10:28:55 +08:00
xiekaidong
dfb2714266 更新配置 2023-07-31 16:28:15 +08:00
Fang
0559fd514f 超框 2023-07-31 11:17:39 +08:00
Fang
b5d4f35418 基金购买状态fix 2023-07-31 09:46:09 +08:00
xiekaidong
a98611fb88 bug修复 2023-07-28 18:51:28 +08:00
xiekaidong
9a3549ad43 引导修改 2023-07-28 18:40:31 +08:00
xiekaidong
365a1628ba bug修复 2023-07-27 10:04:08 +08:00
Fang
9bc06371fb 编译 2023-07-26 18:23:37 +08:00
xiekaidong
85d2281b42 修改 2023-07-26 16:25:45 +08:00
Fang
a43ea6c7d7 编译 2023-07-26 16:15:13 +08:00
Fang
e31bf25fa3 装备红点、文案 2023-07-26 15:16:01 +08:00
Fang
5431c724af fix 2023-07-25 23:33:30 +08:00
Fang
5abcbc47e7 支线基金跨阶段fix 2023-07-25 23:11:00 +08:00
Fang
2651eafff4 装备礼包重登不弹窗 2023-07-25 22:49:12 +08:00
Fang
654c34d0b6 动效、fix 2023-07-25 22:35:04 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
Fang
298a77cb44 显示修复、导入特效文件 2023-07-25 21:02:08 +08:00
Fang
aa45c8bbf2 编译 2023-07-25 20:18:47 +08:00
Fang
698bf8e05c 编译 2023-07-25 18:12:06 +08:00