puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c1_lua/lua/app/config
History
xiekaidong 42ad5ec9fa Merge branch 'dev_20230809' into dev_20230815 
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
2023-08-08 15:58:56 +08:00
..
localization
英雄竞技场段位解锁
2023-08-03 18:07:24 +08:00
strings
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
act_chapter_store.lua
更新配置
2023-08-02 18:30:43 +08:00
act_chapter_store.lua.meta
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
act_dungeon_armor_fund.lua
英雄图鉴
2023-07-14 17:07:03 +08:00
act_dungeon_armor_fund.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
act_gift.lua
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
act_gift.lua.meta
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
act_gold_pig.lua
通用技能tips
2023-05-22 16:38:04 +08:00
act_gold_pig.lua.meta
金猪
2023-05-05 14:59:02 +08:00
act_growup_gift_new.lua
更新配置
2023-08-02 18:30:43 +08:00
act_growup_gift_new.lua.meta
竞技场战令文案替换
2023-07-06 14:42:10 +08:00
act_growup_gift.lua
ui资源补充替换
2023-06-13 16:16:18 +08:00
act_growup_gift.lua.meta
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
act_level_fund.lua
提交一波
2023-05-23 18:37:09 +08:00
act_level_fund.lua.meta
死亡召唤buff
2023-05-11 19:11:21 +08:00
act_sevenday_quest_reward.lua
紧急
2023-05-25 17:05:55 +08:00
act_sevenday_quest_reward.lua.meta
死亡召唤buff
2023-05-11 19:11:21 +08:00
act_sevenday_quest.lua
更新配置
2023-07-07 16:53:19 +08:00
act_sevenday_quest.lua.meta
死亡召唤buff
2023-05-11 19:11:21 +08:00
activity_bounty_level.lua
更新配置
2023-08-03 16:59:40 +08:00
activity_bounty_level.lua.meta
更新配置
2023-08-03 16:59:40 +08:00
activity_bounty_task.lua
更新配置
2023-08-03 16:59:40 +08:00
activity_bounty_task.lua.meta
更新配置
2023-08-03 16:59:40 +08:00
activity.lua
更新配置
2023-08-03 16:59:40 +08:00
activity.lua.meta
更新配置
2023-08-03 16:59:40 +08:00
arena_board.lua
更新配置
2023-08-03 16:59:40 +08:00
arena_board.lua.meta
竞技场战令
2023-06-26 11:26:28 +08:00
arena_bounty_level.lua
更新配置
2023-08-03 16:59:40 +08:00
arena_bounty_level.lua.meta
竞技场战令
2023-06-26 11:26:28 +08:00
arena_rank.lua
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
arena_rank.lua.meta
竞技场战令
2023-06-26 11:26:28 +08:00
arena_robot.lua
导表
2023-07-06 18:19:11 +08:00
arena_robot.lua.meta
竞技场战令
2023-06-26 11:26:28 +08:00
arena_time.lua
竞技场宝箱增加每日次数控制
2023-07-06 10:24:53 +08:00
arena_time.lua.meta
竞技场战令
2023-06-26 11:26:28 +08:00
attr.lua
更新配置
2023-07-13 18:03:33 +08:00
attr.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
avatar_frame.lua
更新配置
2023-08-03 16:59:40 +08:00
avatar_frame.lua.meta
ui资源补充替换
2023-06-13 16:16:18 +08:00
avatar.lua
更新配置
2023-08-03 16:59:40 +08:00
avatar.lua.meta
ui资源补充替换
2023-06-13 16:16:18 +08:00
battle_exp.lua
引导，更新配置
2023-04-21 16:26:57 +08:00
battle_exp.lua.meta
棋盘新的读取方式
2023-04-12 15:16:30 +08:00
bounty_level.lua
英雄图鉴
2023-07-14 17:07:03 +08:00
bounty_level.lua.meta
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
bounty_time.lua
更新配置
2023-06-20 19:58:07 +08:00
bounty_time.lua.meta
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
buff_daily_challenge.lua
bug修复
2023-06-01 17:25:28 +08:00
buff_daily_challenge.lua.meta
紧急
2023-05-25 17:05:55 +08:00
buff.lua
更新配置
2023-08-04 16:56:37 +08:00
buff.lua.meta
章节
2023-04-07 20:50:11 +08:00
chapter_board_daily_challenge.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
chapter_board_daily_challenge.lua.meta
紧急
2023-05-25 17:05:55 +08:00
chapter_board_dungeon_armor.lua
支线基金
2023-07-24 11:54:09 +08:00
chapter_board_dungeon_armor.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
chapter_board_dungeon_equip.lua
收集奖励报错fix
2023-07-25 15:44:10 +08:00
chapter_board_dungeon_equip.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
chapter_board_dungeon_gold.lua
怪物经验可配置根据血量的分段经验
2023-06-16 18:42:41 +08:00
chapter_board_dungeon_gold.lua.meta
更新配置
2023-06-09 17:34:07 +08:00
chapter_board_dungeon_shards.lua
更新配置
2023-06-16 21:34:30 +08:00
chapter_board_dungeon_shards.lua.meta
更新配置
2023-06-09 17:34:07 +08:00
chapter_board.lua
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
chapter_board.lua.meta
棋盘新的读取方式
2023-04-12 15:16:30 +08:00
chapter_daily_challenge.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
chapter_daily_challenge.lua.meta
紧急
2023-05-25 17:05:55 +08:00
chapter_dungeon_armor_reward.lua
收集奖励报错fix
2023-07-25 15:44:10 +08:00
chapter_dungeon_armor_reward.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
chapter_dungeon_armor.lua
更新配置
2023-08-04 16:56:37 +08:00
chapter_dungeon_armor.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
chapter_dungeon_equip.lua
更新配置
2023-08-04 16:56:37 +08:00
chapter_dungeon_equip.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
chapter_dungeon_gold.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
chapter_dungeon_gold.lua.meta
更新配置
2023-06-09 17:34:07 +08:00
chapter_dungeon_shards.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
chapter_dungeon_shards.lua.meta
更新配置
2023-06-09 17:34:07 +08:00
chapter.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
chapter.lua.meta
章节
2023-04-07 20:50:11 +08:00
collection.lua
收集奖励报错fix
2023-07-25 15:44:10 +08:00
collection.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
const.lua
更新配置
2023-08-03 16:59:40 +08:00
const.lua.meta
棋盘
2023-04-07 11:24:27 +08:00
dungeon_armor_fund.lua
收集奖励报错fix
2023-07-25 15:44:10 +08:00
dungeon_armor_fund.lua.meta
层数buff完善
2023-07-17 14:46:02 +08:00
equip_level.lua
显示fix
2023-07-25 18:11:05 +08:00
equip_level.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
equip.lua
更新配置
2023-07-26 15:58:03 +08:00
equip.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
func_open.lua
更新配置
2023-08-03 16:59:40 +08:00
func_open.lua.meta
金猪
2023-05-05 14:59:02 +08:00
fx.lua
副本引导
2023-07-24 17:10:39 +08:00
fx.lua.meta
引导，更新配置
2023-04-21 16:26:57 +08:00
grid_edge_type.lua
更新配置
2023-08-03 16:59:40 +08:00
grid_edge_type.lua.meta
木棍边缘障碍物
2023-08-02 18:07:44 +08:00
grid_type.lua
更新配置
2023-08-04 16:56:37 +08:00
grid_type.lua.meta
格子类型的一些配置改为配置表控制
2023-05-12 11:43:49 +08:00
hero_level.lua
更新配置，上传资源
2023-07-21 17:17:51 +08:00
hero_level.lua.meta
章节
2023-04-07 20:50:11 +08:00
hero.lua
更新配置
2023-08-03 16:59:40 +08:00
hero.lua.meta
章节
2023-04-07 20:50:11 +08:00
item.lua
更新配置
2023-08-04 16:56:37 +08:00
item.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
localization.meta
整理代码
2023-04-03 10:59:13 +08:00
mail.lua
更新配置
2023-06-05 15:54:09 +08:00
mail.lua.meta
宝箱
2023-05-17 18:17:09 +08:00
mall_daily.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
mall_daily.lua.meta
战令
2023-05-12 15:32:53 +08:00
mall_gold.lua
更新配置
2023-06-06 14:39:25 +08:00
mall_gold.lua.meta
战令
2023-05-12 15:32:53 +08:00
mall_treasure.lua
紧急
2023-05-25 17:05:55 +08:00
mall_treasure.lua.meta
战令
2023-05-12 15:32:53 +08:00
monster_base.lua
更新配置
2023-07-21 11:38:46 +08:00
monster_base.lua.meta
棋盘新的读取方式
2023-04-12 15:16:30 +08:00
monster_chapter.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
monster_chapter.lua.meta
棋盘新的读取方式
2023-04-12 15:16:30 +08:00
monster_daily_challenge.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
monster_daily_challenge.lua.meta
紧急
2023-05-25 17:05:55 +08:00
monster_dungeon_armor.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
monster_dungeon_armor.lua.meta
更新配置和优化
2023-07-17 17:21:00 +08:00
monster_dungeon_equip.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
monster_dungeon_equip.lua.meta
更新配置和优化
2023-07-17 17:21:00 +08:00
monster_dungeon_gold.lua
竞技场战令文案替换
2023-07-06 14:42:10 +08:00
monster_dungeon_gold.lua.meta
新的肉鸽机制-改变effect概率
2023-06-13 11:11:06 +08:00
monster_dungeon_shards.lua
竞技场战令文案替换
2023-07-06 14:42:10 +08:00
monster_dungeon_shards.lua.meta
更新配置
2023-06-09 17:34:07 +08:00
player_exp.lua
紧急
2023-05-25 17:05:55 +08:00
player_exp.lua.meta
死亡召唤buff
2023-05-11 19:11:21 +08:00
player_initial.lua
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
player_initial.lua.meta
数据处理
2023-04-07 22:23:00 +08:00
recharge.lua
更新recharge
2023-06-15 11:10:11 +08:00
recharge.lua.meta
金猪
2023-05-05 14:59:02 +08:00
recovery.lua
竞技场战令
2023-06-26 11:26:28 +08:00
recovery.lua.meta
数据处理
2023-04-07 22:23:00 +08:00
skill_rogue.lua
更新配置
2023-08-08 11:44:16 +08:00
skill_rogue.lua.meta
棋盘
2023-04-07 11:24:27 +08:00
skill.lua
Merge branch 'dev_20230809' into dev_20230815
2023-08-08 15:58:56 +08:00
skill.lua.meta
移动攻击表现
2023-04-12 23:10:22 +08:00
skin.lua
更新配置
2023-08-03 16:59:40 +08:00
skin.lua.meta
更新配置
2023-08-03 16:59:40 +08:00
strings.meta
整理代码
2023-04-03 10:59:13 +08:00
struct.lua
木棍边缘障碍物
2023-08-02 18:07:44 +08:00
struct.lua.meta
整理代码
2023-04-03 10:59:13 +08:00
summon_exp.lua
更新配置
2023-06-05 21:30:53 +08:00
summon_exp.lua.meta
配置
2023-05-12 21:08:50 +08:00
summon.lua
更新配置
2023-08-02 18:30:43 +08:00
summon.lua.meta
配置
2023-05-12 21:08:50 +08:00
task_daily_challenge.lua
武器副本增加体力消耗
2023-08-03 11:08:04 +08:00
task_daily_challenge.lua.meta
紧急
2023-05-25 17:05:55 +08:00
task_daily.lua
提交一波
2023-05-23 18:37:09 +08:00
task_daily.lua.meta
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
task_dungeon_armor.lua
更新配置
2023-07-27 10:27:48 +08:00
task_dungeon_armor.lua.meta
英雄图鉴
2023-07-14 17:07:03 +08:00
task.lua
更新配置
2023-06-06 10:49:11 +08:00
task.lua.meta
灼烧、易伤、中毒、腐败、削弱、诅咒buff提交
2023-05-09 15:15:07 +08:00
tutorial_start.lua
副本引导
2023-07-24 17:10:39 +08:00
tutorial_start.lua.meta
技能解锁
2023-04-20 21:26:35 +08:00
tutorial.lua
更新配置
2023-08-03 16:59:40 +08:00
tutorial.lua.meta
技能解锁
2023-04-20 21:26:35 +08:00