puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
xiekaidong 2023-06-01 17:25:28 +08:00
parent 9429f79a1e
commit 9a6c3966cb
14 changed files with 3736 additions and 3059 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/config/buff.lua
View File

@ -257,7 +257,7 @@ local buff = {
["decr"]=1,
["formula"]=3,
["fx_get"]={
300025
300027
}
},
[33]={

74
lua/app/config/buff_daily_challenge.lua
View File

@ -5,7 +5,7 @@ local buff_daily_challenge = {
{
["type"]="exp_time_add",
["num"]=1000,
["ratio"]=1000,
["ratio"]=10000,
["round"]=999
}
},
@ -17,7 +17,7 @@ local buff_daily_challenge = {
{
["type"]="dmg_addition_all_add",
["num"]=500,
["ratio"]=1000,
["ratio"]=10000,
["round"]=999
}
},
@ -29,7 +29,7 @@ local buff_daily_challenge = {
{
["type"]="dec_dmg_all_add",
["num"]=1000,
["ratio"]=1000,
["ratio"]=10000,
["round"]=999
}
},
@ -40,14 +40,14 @@ local buff_daily_challenge = {
["effect"]={
{
["type"]="crit_add",
["num"]=2000,
["ratio"]=1000,
["num"]=1000,
["ratio"]=10000,
["round"]=999
},
{
["type"]="crit_time_add",
["num"]=3000,
["ratio"]=1000,
["num"]=1500,
["ratio"]=10000,
["round"]=999
}
},
@ -59,7 +59,7 @@ local buff_daily_challenge = {
{
["type"]="skill_hurt_add",
["num"]=1500,
["ratio"]=1000,
["ratio"]=10000,
["round"]=999
}
},
@ -69,13 +69,13 @@ local buff_daily_challenge = {
["buff_type"]=1,
["effect"]={
{
["type"]="wavehealp",
["num"]=100,
["type"]="add_skill",
["num"]=8,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=1
["obj"]=8
},
[7]={
["buff_type"]=1,
@ -83,37 +83,25 @@ local buff_daily_challenge = {
{
["type"]="cured_add",
["num"]=500,
["ratio"]=500,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=1
},
[8]={
["buff_type"]=1,
["effect"]={
{
["type"]="wavehealp",
["num"]=100,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=1
},
[9]={
["buff_type"]=2,
["effect"]={
{
["type"]="atkp_add",
["num"]=500,
["ratio"]=1000,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=2
},
[10]={
[9]={
["buff_type"]=2,
["effect"]={
{
@ -125,7 +113,7 @@ local buff_daily_challenge = {
},
["obj"]=2
},
[11]={
[10]={
["buff_type"]=2,
["effect"]={
{
@ -137,37 +125,37 @@ local buff_daily_challenge = {
},
["obj"]=2
},
[12]={
[11]={
["buff_type"]=2,
["effect"]={
{
["type"]="cured_dec",
["num"]=1000,
["ratio"]=1000,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=1
},
[12]={
["buff_type"]=2,
["effect"]={
{
["type"]="block",
["num"]=500,
["ratio"]=10000,
["round"]=999
}
},
["obj"]=2
},
[13]={
["buff_type"]=2,
["effect"]={
{
["type"]="block",
["num"]=500,
["ratio"]=1000,
["round"]=999
}
},
["obj"]=2
},
[14]={
["buff_type"]=2,
["effect"]={
{
["type"]="dec_dmg_all_add",
["num"]=500,
["ratio"]=1000,
["ratio"]=10000,
["round"]=999
}
},
@ -175,6 +163,6 @@ local buff_daily_challenge = {
}
}
local config = {
data=buff_daily_challenge,count=14
data=buff_daily_challenge,count=13
}
return config

232
lua/app/config/chapter.lua
View File

@ -123,12 +123,12 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=28
["weight"]=100
}
},
["daily_challenge_difficulty"]={
30000,
30000
11000,
11000
}
},
[2]={
@ -274,12 +274,12 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=28
["weight"]=100
}
},
["daily_challenge_difficulty"]={
30000,
30000
11000,
11000
}
},
[3]={
@ -420,12 +420,12 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=28
["weight"]=100
}
},
["daily_challenge_difficulty"]={
30000,
30000
11000,
11000
}
},
[4]={
@ -617,12 +617,12 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=28
["weight"]=100
}
},
["daily_challenge_difficulty"]={
30000,
30000
11000,
11000
}
},
[5]={
@ -814,18 +814,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=28
["weight"]=90
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=2
["weight"]=10
}
},
["daily_challenge_difficulty"]={
30000,
30000
12672,
15334
}
},
[6]={
@ -1017,18 +1017,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=25
["weight"]=85
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=5
["weight"]=15
}
},
["daily_challenge_difficulty"]={
30000,
30000
13453,
16814
}
},
[7]={
@ -1236,18 +1236,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=25
["weight"]=85
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=5
["weight"]=15
}
},
["daily_challenge_difficulty"]={
30000,
30000
15389,
19894
}
},
[8]={
@ -1455,18 +1455,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=25
["weight"]=85
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=5
["weight"]=15
}
},
["daily_challenge_difficulty"]={
30000,
30000
17688,
23408
}
},
[9]={
@ -1674,18 +1674,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=25
["weight"]=85
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=5
["weight"]=15
}
},
["daily_challenge_difficulty"]={
30000,
30000
19289,
26153
}
},
[10]={
@ -1893,18 +1893,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=25
["weight"]=85
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=5
["weight"]=15
}
},
["daily_challenge_difficulty"]={
30000,
30000
22561,
31119
}
},
[11]={
@ -2112,18 +2112,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=23
["weight"]=80
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=7
["weight"]=20
}
},
["daily_challenge_difficulty"]={
30000,
30000
26466,
35657
}
},
[12]={
@ -2331,18 +2331,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=23
["weight"]=80
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=7
["weight"]=20
}
},
["daily_challenge_difficulty"]={
30000,
30000
27220,
38682
}
},
[13]={
@ -2550,18 +2550,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=23
["weight"]=80
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=7
["weight"]=20
}
},
["daily_challenge_difficulty"]={
30000,
30000
28479,
41052
}
},
[14]={
@ -2769,18 +2769,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=23
["weight"]=80
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=7
["weight"]=20
}
},
["daily_challenge_difficulty"]={
30000,
30000
30899,
45133
}
},
[15]={
@ -2988,18 +2988,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=23
["weight"]=80
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=7
["weight"]=20
}
},
["daily_challenge_difficulty"]={
30000,
30000
31774,
46992
}
},
[16]={
@ -3207,18 +3207,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=20
["weight"]=75
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=10
["weight"]=25
}
},
["daily_challenge_difficulty"]={
30000,
30000
33633,
50331
}
},
[17]={
@ -3426,18 +3426,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=20
["weight"]=75
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=10
["weight"]=25
}
},
["daily_challenge_difficulty"]={
30000,
30000
35024,
53042
}
},
[18]={
@ -3645,18 +3645,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=20
["weight"]=75
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=10
["weight"]=25
}
},
["daily_challenge_difficulty"]={
30000,
30000
37136,
56738
}
},
[19]={
@ -3864,18 +3864,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=20
["weight"]=75
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=10
["weight"]=25
}
},
["daily_challenge_difficulty"]={
30000,
30000
38143,
59004
}
},
[20]={
@ -4083,18 +4083,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=20
["weight"]=75
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=10
["weight"]=25
}
},
["daily_challenge_difficulty"]={
30000,
30000
40535,
63234
}
},
[21]={
@ -4302,18 +4302,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=18
["weight"]=70
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=12
["weight"]=30
}
},
["daily_challenge_difficulty"]={
30000,
30000
42114,
66275
}
},
[22]={
@ -4521,18 +4521,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=18
["weight"]=70
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=12
["weight"]=30
}
},
["daily_challenge_difficulty"]={
30000,
30000
44759,
70994
}
},
[23]={
@ -4740,18 +4740,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=18
["weight"]=70
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=12
["weight"]=30
}
},
["daily_challenge_difficulty"]={
30000,
30000
46690,
74635
}
},
[24]={
@ -4959,18 +4959,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=18
["weight"]=70
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=12
["weight"]=30
}
},
["daily_challenge_difficulty"]={
30000,
30000
47564,
76615
}
},
[25]={
@ -5178,18 +5178,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=18
["weight"]=70
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=12
["weight"]=30
}
},
["daily_challenge_difficulty"]={
30000,
30000
51332,
83375
}
},
[26]={
@ -5397,18 +5397,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=15
["weight"]=65
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=15
["weight"]=35
}
},
["daily_challenge_difficulty"]={
30000,
30000
52333,
85564
}
},
[27]={
@ -5616,18 +5616,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=15
["weight"]=65
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=15
["weight"]=35
}
},
["daily_challenge_difficulty"]={
30000,
30000
56568,
93055
}
},
[28]={
@ -5835,18 +5835,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=15
["weight"]=65
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=15
["weight"]=35
}
},
["daily_challenge_difficulty"]={
30000,
30000
61303,
101426
}
},
[29]={
@ -6054,18 +6054,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=15
["weight"]=65
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=15
["weight"]=35
}
},
["daily_challenge_difficulty"]={
30000,
30000
56931,
94804
}
},
[30]={
@ -6272,18 +6272,18 @@ local chapter = {
["type"]=1,
["id"]=4,
["num"]=1,
["weight"]=15
["weight"]=65
},
{
["type"]=1,
["id"]=5,
["num"]=1,
["weight"]=15
["weight"]=35
}
},
["daily_challenge_difficulty"]={
30000,
30000
62926,
105386
}
}
}

56
lua/app/config/chapter_board.lua
View File

@ -3673,7 +3673,7 @@ local chapter_board = {
3
},
{
3,
2,
0
},
{
@ -3681,7 +3681,7 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
@ -3689,7 +3689,7 @@ local chapter_board = {
3
},
{
3,
2,
0
},
{
@ -3697,7 +3697,7 @@ local chapter_board = {
3
},
{
3,
2,
0
},
{
@ -3705,7 +3705,7 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
@ -3713,7 +3713,7 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
@ -3721,35 +3721,35 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
@ -3871,7 +3871,7 @@ local chapter_board = {
3
},
{
3,
2,
0
},
{
@ -3879,7 +3879,7 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
@ -3887,7 +3887,7 @@ local chapter_board = {
3
},
{
3,
2,
0
},
{
@ -3895,7 +3895,7 @@ local chapter_board = {
3
},
{
3,
2,
0
},
{
@ -3903,7 +3903,7 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
@ -3911,7 +3911,7 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
@ -3919,35 +3919,35 @@ local chapter_board = {
4
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{
3,
2,
0
},
{

3220
lua/app/config/chapter_daily_challenge.lua
View File

File diff suppressed because it is too large Load Diff

2
lua/app/config/const.lua
View File

@ -111,7 +111,7 @@ local const = {
["value"]=600
},
["idle_item_drop_time"]={
["value"]=600
["value"]=1800
},
["idle_drop_fast_times_1"]={
["value"]=2

1069
lua/app/config/fx.lua
View File

File diff suppressed because it is too large Load Diff

12
lua/app/config/monster_chapter.lua
View File

@ -972,6 +972,9 @@ local monster_chapter = {
30065,
30066
},
["skill"]={
10023
},
["monster_exp"]=18000
},
[7601]={
@ -1097,6 +1100,9 @@ local monster_chapter = {
30065,
30066
},
["skill"]={
10023
},
["monster_exp"]=24000
},
[8601]={
@ -1163,6 +1169,9 @@ local monster_chapter = {
10067,
10068
},
["passive_skill"]={
10013
},
["monster_exp"]=22000
},
[9101]={
@ -1288,6 +1297,9 @@ local monster_chapter = {
30065,
30066
},
["skill"]={
10023
},
["monster_exp"]=12000
},
[10101]={

894
lua/app/config/monster_daily_challenge.lua
View File

File diff suppressed because it is too large Load Diff

1163
lua/app/config/skill.lua
View File

File diff suppressed because it is too large Load Diff

28
lua/app/config/skill_rogue.lua
View File

@ -1914,18 +1914,11 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=2,
["skill_position"]=3,
["boardrange"]={
{
["type"]=1,
["range"]=2
},
{
["type"]=2,
["range"]=2
}
["parameter"]={
3300125
},
["skill_position"]=3,
["icon"]="82"
},
[3300104]={
@ -2974,18 +2967,11 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=2,
["type"]=1,
["parameter"]={
5300225
},
["skill_position"]=5,
["boardrange"]={
{
["type"]=3,
["range"]=2
},
{
["type"]=4,
["range"]=2
}
},
["icon"]="129"
},
[5300202]={

27
lua/app/module/battle/controller/battle_controller.lua
View File

@ -3,6 +3,7 @@ local BattleScheduler = require "app/module/battle/helper/battle_scheduler"
local BattleTeam = require "app/module/battle/team/battle_team"
local BattlePassive = require "app/module/battle/helper/battle_passive"
local BattlePool = require "app/module/battle/helper/battle_pool"
local BattleBuffEntity = require "app/userdata/battle/skill/battle_buff_entity"
local BattleController = class("BattleController")
@ -43,14 +44,31 @@ function BattleController:getBuffs()
end
function BattleController:handleBuffs(side)
for _, buffEntity in ipairs(self:getBuffs()) do
for _, buffInfo in ipairs(self:getBuffs()) do
local buffEntity = buffInfo.buffEntity
local buffTargetSide = buffEntity:getTargetSide()
local target
if buffTargetSide == BattleConst.SIDE_ATK then
target = self.atkTeam:getMainUnit()
else
if buffTargetSide == BattleConst.SIDE_DEF then
target = self.defTeam:getMainUnit()
elseif buffTargetSide == BattleConst.SIDE_ATK then
target = self.atkTeam:getMainUnit()
elseif buffTargetSide == BattleConst.SIDE_ATK_ALL then
if not side or side == buffTargetSide then
for matchtype, comp in pairs(self.atkTeam:getUnitComp()) do
local buffEntity = BattleBuffEntity:create()
buffEntity:init(buffInfo.effect, comp.unitEntity)
buffEntity:setTargetSide(buffTargetSide)
comp:takeEffect(buffEntity, comp)
end
end
else
local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[buffTargetSide]
if matchType then
target = self.atkTeam:getUnitComp()[matchType]
end
end
if target then
if side then
if buffTargetSide == side then
buffEntity:setOwner(target)
@ -61,6 +79,7 @@ function BattleController:handleBuffs(side)
target:takeEffect(buffEntity, target)
end
end
end
end
-- 战斗对应的ui

2
lua/app/module/battle/controller/battle_controller_daily_challenge.lua
View File

@ -36,7 +36,7 @@ function BattleControllerDailyChallenge:getBuffs()
buffEntity:setTargetSide(cfg[buffId].obj)
buffEntity:setIsCantRemove(true)
table.insert(self.initBuffs, buffEntity)
table.insert(self.initBuffs, {buffEntity = buffEntity, effect = effect[1]})
end
end
end

2
lua/app/module/battle/skill/battle_grid_effect_handle.lua
View File

@ -30,7 +30,7 @@ local function _crossSpread(entity, gridEntities, battleController, onlyCheck)
for _, posId in ipairs(tempList) do
local gridEntity = gridEntities[posId]
if gridEntity:isEmptyIdle() then
battleController.battleData:setGridType(posId, BattleConst.GRID_TYPE.JELLY)
battleController.battleData:setGridType(posId, entity:getGridType() or BattleConst.GRID_TYPE.JELLY)
succ = true
break
end