puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,546 Commits 7 Branches 94 Tags
Commit Graph

80 Commits

Author SHA1 Message Date
Fang
86ef5a0693 锦标赛入口导入 2023-10-08 17:02:18 +08:00
Fang
327cffeb56 竞技场锦标赛 2023-09-28 10:23:25 +08:00
Fang
f6c4010add 波次锦标赛 2023-09-28 10:23:25 +08:00
xiekaidong
2dbe46c258 第一版梦魇酒馆，差表现 2023-09-16 18:08:18 +08:00
xiekaidong
820a22b051 Merge branch 'dev_20230919' into limit_pvp 
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/pay_manager.lua
#	lua/app/config/activity_pvp_board.lua.meta
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/monster_activity.lua
#	lua/app/config/monster_base.lua
#	lua/app/config/skill.lua
#	lua/app/config/skin.lua
#	lua/app/config/skin_skill.lua
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/cn/skill_rogue.lua
#	lua/app/config/strings/cn/skin.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/de/skin.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/en/skin.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/es/skin.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/fr/skin.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/id/skin.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skin.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/ko/skin.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/pt/skin.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/ru/skin.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/th/skin.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/vi/skin.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skin.lua
#	lua/app/config/task_type.lua.meta
#	lua/app/global/global_const.lua
#	lua/app/module/battle/battle_const.lua
#	lua/app/module/battle/battle_manager.lua
 2023-09-16 17:55:38 +08:00
Fang
8c1082793e 圆月活动 2023-09-15 19:22:15 +08:00
xiekaidong
8b6b8d2772 数据层 2023-09-15 17:28:14 +08:00
xiekaidong
0cdb8515ca 侧边栏 2023-09-04 16:06:42 +08:00
xiekaidong
4e5021741d Merge branch 'dev_20230905' into boss_rush 
# Conflicts:
#	lua/app/common/bi_report.lua
#	lua/app/common/data_manager.lua
#	lua/app/common/local_data.lua
#	lua/app/common/module_manager.lua
#	lua/app/config/act_fourteen_bounty.lua.meta
#	lua/app/config/act_fourteen_exchange.lua.meta
#	lua/app/config/act_fourteen_quest.lua
#	lua/app/config/act_fourteen_quest.lua.meta
#	lua/app/config/activity_boss_rush_chapter.lua.meta
#	lua/app/config/activity_boss_rush_exchange.lua.meta
#	lua/app/config/activity_boss_rush_rank.lua.meta
#	lua/app/config/activity_exchange.lua.meta
#	lua/app/config/avatar_frame.lua
#	lua/app/config/chapter_board_bossrush.lua.meta
#	lua/app/config/monster_activity.lua.meta
#	lua/app/config/strings/cn/act_fourteen_quest.lua.meta
#	lua/app/config/strings/cn/global.lua
#	lua/app/config/strings/cn/task_type.lua.meta
#	lua/app/config/strings/de/act_fourteen_quest.lua.meta
#	lua/app/config/strings/de/task_type.lua.meta
#	lua/app/config/strings/en/act_fourteen_quest.lua.meta
#	lua/app/config/strings/en/task_type.lua.meta
#	lua/app/config/strings/es/act_fourteen_quest.lua.meta
#	lua/app/config/strings/es/task_type.lua.meta
#	lua/app/config/strings/fr/act_fourteen_quest.lua.meta
#	lua/app/config/strings/fr/task_type.lua.meta
#	lua/app/config/strings/id/act_fourteen_quest.lua.meta
#	lua/app/config/strings/id/task_type.lua.meta
#	lua/app/config/strings/ja/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ja/task_type.lua.meta
#	lua/app/config/strings/ko/act_fourteen_quest.lua.meta
#	lua/app/config/strings/ko/task_type.lua.meta
#	lua/app/config/strings/pt/act_fourteen_quest.lua.meta
#	lua/app/config/strings/pt/task_type.lua.meta
#	lua/app/config/strings/ru/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/act_fourteen_quest.lua.meta
#	lua/app/config/strings/th/task_type.lua.meta
#	lua/app/config/strings/vi/act_fourteen_quest.lua.meta
#	lua/app/config/strings/vi/task_type.lua.meta
#	lua/app/config/strings/zh/act_fourteen_quest.lua.meta
#	lua/app/config/strings/zh/task_type.lua.meta
#	lua/app/proto/proto_msg_type.lua
 2023-09-01 21:18:54 +08:00
xiekaidong
eed3f88d79 首领公开赛 2023-09-01 21:10:05 +08:00
Fang
89eeac3f2d 新手14天乐 2023-09-01 15:35:19 +08:00
xiekaidong
049d7508ea bossrush 2023-08-31 20:18:14 +08:00
xiekaidong
211d7cc71e boss_rush 2023-08-30 19:11:38 +08:00
Fang
2da8da07d0 装备升级礼包 2023-08-24 17:29:33 +08:00
xiekaidong
b2a829741b 界面调整 2023-08-23 17:35:27 +08:00
xiekaidong
57682466f6 Merge branch 'herofund' into dev_20230829 2023-08-18 18:09:20 +08:00
xiekaidong
b5fb7a7e28 英雄基金 2023-08-18 14:39:01 +08:00
Fang
e85bf4888d 优化夏日活动请求 2023-08-17 12:06:56 +08:00
Fang
84796cd4a8 活动礼包弹出逻辑补充 2023-08-11 15:08:23 +08:00
Fang
e0db8bcfda 夏日活动 2023-08-11 11:52:12 +08:00
xiekaidong
a6b05117b7 Merge branch 'master' into dev_20230809 
# Conflicts:
#	lua/app/config/grid_type.lua
#	lua/app/userdata/dungeon/dungeon_armor_entity.lua
 2023-08-08 11:41:34 +08:00
xiekaidong
a47f18db07 日志上报 2023-08-03 14:20:16 +08:00
Fang
591aee945b 增加优惠入口红点逻辑 2023-08-01 18:19:29 +08:00
xiekaidong
3148733679 更新配置，上传资源 2023-07-21 17:17:51 +08:00
Fang
61b302305e 装备礼包 2023-07-21 09:35:21 +08:00
xiekaidong
6249f3bd3e 引导bug修复 2023-07-17 10:34:10 +08:00
Fang
fe2f7de08b 礼包入口spine 2023-07-14 15:26:38 +08:00
xiekaidong
99a26d953d 侧边栏增加前往优惠商城的按钮，修改战斗内技能链接显示bug 2023-07-13 15:52:18 +08:00
Fang
c4aed1b62d 主界面英雄页图标显示处理 2023-07-07 15:39:50 +08:00
Fang
b8155b97de 成长礼包触发方式修改 2023-07-06 18:17:37 +08:00
xiekaidong
7d8b58cef3 bug修复 2023-07-06 17:28:23 +08:00
xiekaidong
c976166cc9 竞技场弹窗礼包 2023-07-03 19:57:39 +08:00
CloudJ
73f1a4d299 成长礼包 2023-06-29 10:41:31 +08:00
CloudJ
b59a8d20d6 入门礼包 2023-06-27 17:24:32 +08:00
chenxi
fa7d250931 设置主城按钮的位置 2023-06-20 11:48:16 +08:00
chenxi
8891f004ff 审核模式 2023-06-12 18:25:14 +08:00
CloudJ
f3c035b5c4 替换礼包spine 2023-06-05 17:21:34 +08:00
Fang
1ed63af6ed 主界面按钮spine替换 2023-06-05 11:45:51 +08:00
CloudJ
1d7603ac2e 首充侧边栏替换 2023-06-03 22:55:39 +08:00
chenxi
f22fedb926 英雄位置和金猪spine 2023-06-03 11:58:18 +08:00
CloudJ
92b5b3655a Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-02 18:40:53 +08:00
CloudJ
3e0beb4500 侧边栏礼包替换spine 2023-06-02 18:40:51 +08:00
Fang
b6936a2c4a 功能解锁飞行动画 2023-06-02 18:35:36 +08:00
CloudJ
9286537e65 Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev 2023-06-01 20:46:11 +08:00
chenxi
58e5bbc33d 主界面点击音效 2023-06-01 20:34:41 +08:00
CloudJ
d2b99b7593 召唤表现调整 2023-06-01 15:42:17 +08:00
chenxi
03d2625a0c 侧边栏 2023-06-01 15:35:38 +08:00
chenxi
7ddcbad7fa 侧边栏spine逻辑调整 2023-06-01 15:03:22 +08:00
Fang
22fa971494 spine动画报错fix 2023-06-01 11:46:45 +08:00
Fang
77a15a260f 主界面成长礼包图标动画添加 2023-06-01 11:08:44 +08:00