# Conflicts:
#	lua/app/config/buff.lua.meta
#	lua/app/config/chapter.lua
#	lua/app/config/chapter.lua.meta
#	lua/app/config/hero.lua.meta
#	lua/app/config/hero_level.lua
#	lua/app/config/hero_level.lua.meta
#	lua/app/config/skill_hero.lua
#	lua/app/config/skill_hero.lua.meta
#	lua/app/config/strings/cn/chapter.lua.meta
#	lua/app/config/strings/cn/hero.lua.meta
#	lua/app/config/strings/cn/skill_hero.lua.meta
#	lua/app/config/strings/de/chapter.lua.meta
#	lua/app/config/strings/de/hero.lua.meta
#	lua/app/config/strings/de/skill_hero.lua.meta
#	lua/app/config/strings/en/chapter.lua.meta
#	lua/app/config/strings/en/hero.lua.meta
#	lua/app/config/strings/en/skill_hero.lua.meta
#	lua/app/config/strings/fr/chapter.lua.meta
#	lua/app/config/strings/fr/hero.lua.meta
#	lua/app/config/strings/fr/skill_hero.lua.meta
#	lua/app/config/strings/id/chapter.lua.meta
#	lua/app/config/strings/id/hero.lua.meta
#	lua/app/config/strings/id/skill_hero.lua.meta
#	lua/app/config/strings/ja/chapter.lua.meta
#	lua/app/config/strings/ja/hero.lua.meta
#	lua/app/config/strings/ja/skill_hero.lua.meta
#	lua/app/config/strings/ko/chapter.lua.meta
#	lua/app/config/strings/ko/hero.lua.meta
#	lua/app/config/strings/ko/skill_hero.lua.meta
#	lua/app/config/strings/pt/chapter.lua.meta
#	lua/app/config/strings/pt/hero.lua.meta
#	lua/app/config/strings/pt/skill_hero.lua.meta
#	lua/app/config/strings/ru/chapter.lua.meta
#	lua/app/config/strings/ru/hero.lua.meta
#	lua/app/config/strings/ru/skill_hero.lua.meta
#	lua/app/config/strings/th/chapter.lua.meta
#	lua/app/config/strings/th/hero.lua.meta
#	lua/app/config/strings/th/skill_hero.lua.meta
#	lua/app/config/strings/vi/chapter.lua.meta
#	lua/app/config/strings/vi/hero.lua.meta
#	lua/app/config/strings/vi/skill_hero.lua.meta
#	lua/app/config/strings/zh/chapter.lua.meta
#	lua/app/config/strings/zh/hero.lua.meta
#	lua/app/config/strings/zh/skill_hero.lua.meta
This commit is contained in:
xiekaidong 2023-04-10 09:58:58 +08:00
commit aacf7bc803
106 changed files with 4063 additions and 1413 deletions

View File

@ -18,6 +18,13 @@ function ConfigManager:getConfig(configName)
return config.data
end
function ConfigManager:getItemConfig()
if self.itemCfg == nil then
self.itemCfg = self:getConfig("item")
end
return self.itemCfg
end
if NOT_PUBLISH then
ConfigManager.__getConfig = ConfigManager.getConfig
function ConfigManager:getConfig(configName)

View File

@ -5,10 +5,8 @@ local DataManager = {
function DataManager:init()
self.cdCallBack = {}
self._cacheManager = {}
-- self:initManager("BagData", "app/userdata/bag/bag_data")
-- self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data")
self:initManager("PlayerData", "app/userdata/player/player_data")
self:initManager("StageData", "app/userdata/stage/stage_data")
self:initManager("ChapterData", "app/userdata/chapter/chapter_data")
self:initManager("HeroData", "app/userdata/hero/hero_data")
self:initManager("BattleData", "app/userdata/battle/battle_data")
end
@ -65,22 +63,22 @@ function DataManager:clear()
self.cacheTimer = nil
end
self.cdCallBack = {}
-- self.BagData:clear()
-- self.TutorialData:clear()
self.PlayerData:clear()
self.BattleData:clear()
self.ChapterData:clear()
self.HeroData:clear()
ModuleManager.TaskManager:clear()
end
function DataManager:initWithServerData(data)
self:init()
Logger.logHighlight("------------------initWithServerData-----------------------")
Logger.printTable(data)
Time:setServerTimeZone(0)
self.initWithServer = true
self.PlayerData:init(data.PlayerData)
self.ChapterData:init(data.ChapterData)
self.HeroData:init(data.HeroData)
self:scheduleGlobal()
self:checkDataBind()

View File

@ -26,6 +26,7 @@ local LOCAL_DATA_KEY = {
SAVE_POWER_MODE = "SAVE_POWER_MODE", -- 省电模式
LAST_MAIL_ID = "LAST_MAIL_ID",
IS_NEW_PLAYER = "IS_NEW_PLAYER",
DISTINCT_ID = "DISTINCT_ID",
}
LocalData.KEYS = LOCAL_DATA_KEY
@ -319,4 +320,12 @@ function LocalData:setNotNewPlayer()
return self:setInt(LOCAL_DATA_KEY.IS_NEW_PLAYER, 1)
end
function LocalData:setDistinctId(id)
self:setString(LOCAL_DATA_KEY.DISTINCT_ID, id or "")
end
function LocalData:getDistinctId()
return self:getString(LOCAL_DATA_KEY.DISTINCT_ID, "")
end
return LocalData

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5d97060401e1c8d48a6bf3e1b9337bce
guid: c92c154c076b1824f88e4eeaa6f544aa
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,6 @@
local chapter = {
[1]={
["next_chapter"]=2,
["board"]={
{
1,
@ -210,30 +211,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=20
["id_for_nothing"]="Vw==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="1"
},
[2]={
["before_chapter"]=1,
["next_chapter"]=3,
["board"]={
{
1,
@ -446,30 +461,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=25
["id_for_nothing"]="Vw==",
["num"]=25,
["num_for_nothing"]="VA0="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="2"
},
[3]={
["before_chapter"]=2,
["next_chapter"]=4,
["board"]={
{
1,
@ -677,30 +706,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=30
["id_for_nothing"]="Vw==",
["num"]=30,
["num_for_nothing"]="VQg="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="3"
},
[4]={
["before_chapter"]=3,
["next_chapter"]=5,
["board"]={
{
1,
@ -905,30 +948,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=35
["id_for_nothing"]="Vw==",
["num"]=35,
["num_for_nothing"]="VQ0="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="4"
},
[5]={
["before_chapter"]=4,
["next_chapter"]=6,
["board"]={
{
1,
@ -1139,30 +1196,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=20
["id_for_nothing"]="Vw==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="5"
},
[6]={
["before_chapter"]=5,
["next_chapter"]=7,
["board"]={
{
1,
@ -1375,30 +1446,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=25
["id_for_nothing"]="Vw==",
["num"]=25,
["num_for_nothing"]="VA0="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="6"
},
[7]={
["before_chapter"]=6,
["next_chapter"]=8,
["board"]={
{
1,
@ -1606,30 +1691,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=30
["id_for_nothing"]="Vw==",
["num"]=30,
["num_for_nothing"]="VQg="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="7"
},
[8]={
["before_chapter"]=7,
["next_chapter"]=9,
["board"]={
{
1,
@ -1834,30 +1933,44 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=35
["id_for_nothing"]="Vw==",
["num"]=35,
["num_for_nothing"]="VQ0="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="8"
},
[9]={
["before_chapter"]=8,
["next_chapter"]=10,
["board"]={
{
1,
@ -2068,30 +2181,43 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=20
["id_for_nothing"]="Vw==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="9"
},
[10]={
["before_chapter"]=9,
["board"]={
{
1,
@ -2304,25 +2430,37 @@ local chapter = {
["wave_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=1
["id_for_nothing"]="Ug==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=25
["id_for_nothing"]="Vw==",
["num"]=25,
["num_for_nothing"]="VA0="
}
},
["finish_reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["num"]=5
["id_for_nothing"]="Ug==",
["num"]=5,
["num_for_nothing"]="Uw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["num"]=1000
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
},
["icon"]="10"

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2b11cd1a5a7011a42980563e2f966c4e
guid: 3d9935f2098050744b4ccc5639f9ecd1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e4de3b3cfa480a541bd8196e08f63bd9
guid: 86113427518d382438fa1e9684cbb09d
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -10,7 +10,8 @@ local hero_level = {
["cost_2"]={
5,
100
}
},
["unlock_skill"]=1
},
[3]={
["cost_2"]={
@ -20,7 +21,8 @@ local hero_level = {
["cost_3"]={
3,
0
}
},
["unlock_skill"]=1
},
[4]={
["cost_2"]={
@ -45,7 +47,8 @@ local hero_level = {
["cost_4"]={
3,
500
}
},
["unlock_skill"]=2
},
[6]={
["cost_2"]={
@ -59,7 +62,8 @@ local hero_level = {
["cost_4"]={
5,
500
}
},
["unlock_skill"]=2
},
[7]={
["cost_2"]={
@ -73,7 +77,8 @@ local hero_level = {
["cost_4"]={
10,
500
}
},
["unlock_skill"]=2
},
[8]={
["cost_2"]={
@ -102,7 +107,8 @@ local hero_level = {
["cost_4"]={
40,
10000
}
},
["unlock_skill"]=3
},
[10]={
["cost_2"]={
@ -116,7 +122,8 @@ local hero_level = {
["cost_4"]={
80,
10000
}
},
["unlock_skill"]=3
},
[11]={
["cost_2"]={
@ -130,7 +137,8 @@ local hero_level = {
["cost_4"]={
160,
10000
}
},
["unlock_skill"]=3
},
[12]={
["cost_2"]={
@ -144,7 +152,8 @@ local hero_level = {
["cost_4"]={
320,
10000
}
},
["unlock_skill"]=3
},
[13]={
["cost_2"]={
@ -158,7 +167,8 @@ local hero_level = {
["cost_4"]={
640,
10000
}
},
["unlock_skill"]=3
},
[14]={
["cost_2"]={
@ -172,7 +182,8 @@ local hero_level = {
["cost_4"]={
1000,
10000
}
},
["unlock_skill"]=3
},
[15]={
["cost_2"]={
@ -186,7 +197,8 @@ local hero_level = {
["cost_4"]={
1500,
10000
}
},
["unlock_skill"]=3
}
}
local config = {

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 14f57295dd6b483408a6e09e58d4bf01
guid: febc9ff44f1cbc64e9185f9c4884bdd2
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -17,80 +17,118 @@ local item = {
[4]={
["type"]=3,
["qlt"]=2,
["icon"]="4"
["icon"]="4",
["hero_drop"]={
{
["id"]=5001,
["weight"]=100
},
{
["id"]=5002,
["weight"]=100
},
{
["id"]=5003,
["weight"]=100
},
{
["id"]=5004,
["weight"]=100
},
{
["id"]=5005,
["weight"]=100
}
}
},
[5]={
["type"]=3,
["qlt"]=3,
["icon"]="5"
["icon"]="5",
["hero_drop"]={
{
["id"]=5006,
["weight"]=100
},
{
["id"]=5007,
["weight"]=100
},
{
["id"]=5008,
["weight"]=100
}
}
},
[6]={
["type"]=3,
["qlt"]=4,
["icon"]="6"
["icon"]="6",
["hero_drop"]={
{
["id"]=5006,
["weight"]=100
},
{
["id"]=5007,
["weight"]=100
},
{
["id"]=5008,
["weight"]=100
}
}
},
[5001]={
["type"]=5,
["parameter"]=5001,
["parameter"]=10,
["qlt"]=2,
["icon"]="5001"
},
[5002]={
["type"]=5,
["parameter"]=5002,
["parameter"]=20,
["qlt"]=2,
["icon"]="5002"
},
[5003]={
["type"]=5,
["parameter"]=5003,
["parameter"]=30,
["qlt"]=2,
["icon"]="5003"
},
[5004]={
["type"]=5,
["parameter"]=5004,
["parameter"]=40,
["qlt"]=2,
["icon"]="5004"
},
[5005]={
["type"]=5,
["parameter"]=5005,
["parameter"]=50,
["qlt"]=2,
["icon"]="5005"
},
[5006]={
["type"]=5,
["parameter"]=5006,
["parameter"]=60,
["qlt"]=3,
["icon"]="5006"
},
[5007]={
["type"]=5,
["parameter"]=5007,
["parameter"]=70,
["qlt"]=3,
["icon"]="5007"
},
[5008]={
["type"]=5,
["parameter"]=5008,
["parameter"]=80,
["qlt"]=3,
["icon"]="5008"
},
[5009]={
["type"]=5,
["parameter"]=5009,
["qlt"]=3,
["icon"]="5009"
},
[5010]={
["type"]=5,
["parameter"]=5010,
["qlt"]=3,
["icon"]="5010"
}
}
local config = {
data=item,count=16
data=item,count=14
}
return config

View File

@ -0,0 +1,46 @@
local player_initial = {
[1]={
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=30,
["num_for_nothing"]="VQg="
}
},
[2]={
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5001,
["id_for_nothing"]="UwhcAg==",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
[3]={
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5002,
["id_for_nothing"]="UwhcAQ==",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
[4]={
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5003,
["id_for_nothing"]="UwhcAA==",
["num"]=3,
["num_for_nothing"]="VQ=="
}
}
}
local config = {
data=player_initial,count=4
}
return config

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2a97518dbfab4cc44af1932b8fc96900
guid: c6e38a4ab5010ad49ade2eb95d467b9f
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,11 @@
local recovery = {
[3]={
["type"]=1,
["time"]=900,
["limit"]=30
}
}
local config = {
data=recovery,count=1
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 820efa75b0d798f478e9ab7f2e160986
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,7 @@
local skill_hero = {
[10]={
["energy"]=10,
["position"]=3,
["method"]=2,
["skill_type"]=1,
["boardrange"]={
@ -15,6 +17,8 @@ local skill_hero = {
["icon"]=10
},
[20]={
["energy"]=10,
["position"]=2,
["method"]=2,
["skill_type"]=0,
["effect"]={
@ -29,20 +33,26 @@ local skill_hero = {
["icon"]=20
},
[21]={
["energy"]=10,
["position"]=2,
["method"]=2,
["skill_type"]=2,
["skill_type_parameter"]=2,
["boardrange"]={
{
["type"]=1,
["range"]=1
},
{
["type"]=2,
["range"]=1
},
{
["type"]=6,
["type"]=3,
["range"]=1
},
{
["type"]=8,
["type"]=4,
["range"]=1
}
},
@ -57,6 +67,8 @@ local skill_hero = {
["icon"]=20
},
[30]={
["energy"]=10,
["position"]=4,
["method"]=2,
["skill_type"]=1,
["boardrange"]={
@ -68,6 +80,8 @@ local skill_hero = {
["icon"]=30
},
[40]={
["energy"]=10,
["position"]=5,
["method"]=2,
["skill_type"]=0,
["effect"]={
@ -82,6 +96,8 @@ local skill_hero = {
["icon"]=40
},
[50]={
["energy"]=10,
["position"]=1,
["method"]=2,
["skill_type"]=1,
["boardrange"]={
@ -97,6 +113,8 @@ local skill_hero = {
["icon"]=50
},
[60]={
["energy"]=10,
["position"]=3,
["method"]=2,
["skill_type"]=0,
["effect"]={
@ -111,6 +129,8 @@ local skill_hero = {
["icon"]=60
},
[70]={
["energy"]=10,
["position"]=2,
["method"]=2,
["skill_type"]=0,
["effect"]={
@ -125,8 +145,10 @@ local skill_hero = {
["icon"]=70
},
[71]={
["energy"]=10,
["position"]=2,
["method"]=1,
["skill_type"]=3,
["skill_type"]=2,
["skill_type_parameter"]=2,
["boardrange"]={
{
@ -158,8 +180,10 @@ local skill_hero = {
["icon"]=70
},
[72]={
["energy"]=10,
["position"]=2,
["method"]=1,
["skill_type"]=3,
["skill_type"]=2,
["skill_type_parameter"]=2,
["boardrange"]={
{
@ -198,6 +222,8 @@ local skill_hero = {
["icon"]=70
},
[80]={
["energy"]=10,
["position"]=4,
["method"]=2,
["skill_type"]=0,
["effect"]={
@ -217,6 +243,8 @@ local skill_hero = {
["icon"]=80
},
[81]={
["energy"]=10,
["position"]=4,
["method"]=2,
["skill_type"]=1,
["boardrange"]={

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8f21ad5b647d36e44b0244e08f80dcf7
guid: 816191ff02ba0434098383a2d0d5fd4c
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 06dc66715efffc7488c0799eece909e7
guid: d78fa8d615ae443468ef485a533461ef
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: bfdf114d91c84004f981a42b116e222a
guid: efeee740136fcde44829cd767bcad4d4
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4db85e4e801fe2848b59bdc6f47d2c71
guid: 656b3309081fb064eaac3b429fc88702
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
["desc"]="全局攻击力+3%~5%"
},
[2]={
["desc"]="全局攻击力+8%~12%"
},
[3]={
["desc"]="全局攻击力+13%~20%"
},
[4]={
["desc"]="红色攻击+3%~5%"
},
[5]={
["desc"]="红色攻击+8%~12%"
},
[6]={
["desc"]="红色攻击+13%~20%"
},
[7]={
["desc"]="黄色攻击+3%~5%"
},
[8]={
["desc"]="黄色攻击+8%~12%"
},
[9]={
["desc"]="黄色攻击+13%~20%"
},
[10]={
["desc"]="绿色攻击+3%~5%"
},
[11]={
["desc"]="绿色攻击+8%~12%"
},
[12]={
["desc"]="绿色攻击+13%~20%"
},
[13]={
["desc"]="蓝色攻击+3%~5%"
},
[14]={
["desc"]="蓝色攻击+8%~12%"
},
[15]={
["desc"]="蓝色攻击+13%~20%"
},
[16]={
["desc"]="紫色攻击+3%~5%"
},
[17]={
["desc"]="紫色攻击+8%~12%"
},
[18]={
["desc"]="紫色攻击+13%~20%"
},
[19]={
["desc"]="角色血量低于50%时所有伤害增加40%"
},
[20]={
["desc"]="获得经验+5%"
},
[21]={
["desc"]="最大生命值+3%~5%"
},
[22]={
["desc"]="最大生命值+8%~12%"
},
[23]={
["desc"]="最大生命值+13%~20%"
},
[24]={
["desc"]="回合开始前生命值恢复1%"
},
[25]={
["desc"]="生命值恢复效果提升1%"
},
[26]={
["desc"]="格挡概率增加10%"
},
[27]={
["desc"]="暴击率+10%"
},
[28]={
["desc"]="受到伤害降低10%"
},
[29]={
["desc"]="角色血量恢复10%"
},
[30]={
["desc"]="将场上随机2个非红色元素变为红色"
},
[31]={
["desc"]="将场上随机4个非红色元素变为红色"
},
[32]={
["desc"]="将场上随机5个非红色元素变为红色"
},
[33]={
["desc"]="将场上所有红色元素变成2个"
},
[34]={
["desc"]="将场上随机2个非黄色元素变为黄色"
},
[35]={
["desc"]="将场上随机4个非黄色元素变为黄色"
},
[36]={
["desc"]="将场上随机5个非黄色元素变为黄色"
},
[37]={
["desc"]="将场上所有黄色元素变成2个"
},
[38]={
["desc"]="将场上随机2个非绿色元素变为绿色"
},
[39]={
["desc"]="将场上随机4个非绿色元素变为绿色"
},
[40]={
["desc"]="将场上随机5个非绿色元素变为绿色"
},
[41]={
["desc"]="将场上所有绿色元素变成2个"
},
[42]={
["desc"]="将场上随机2个非蓝色元素变为蓝色"
},
[43]={
["desc"]="将场上随机4个非蓝色元素变为蓝色"
},
[44]={
["desc"]="将场上随机5个非蓝色元素变为蓝色"
},
[45]={
["desc"]="将场上所有蓝色元素变成2个"
},
[46]={
["desc"]="将场上随机2个非紫色元素变为紫色"
},
[47]={
["desc"]="将场上随机4个非紫色元素变为紫色"
},
[48]={
["desc"]="将场上随机5个非紫色元素变为紫色"
},
[49]={
["desc"]="将场上所有紫色元素变成2个"
},
[200101]={
["desc"]="王八拳可上下多消1格"
},
[200102]={
["desc"]="连接王八拳伤害增加10%"
},
[200103]={
["desc"]="连接王八拳每次攻击有10%概率眩晕对手1回合。"
},
[200201]={
["desc"]="生成无影腿终结技时顺带将其底部3个元素变为金色"
},
[200202]={
["desc"]="连接无影腿时伤害增加10%"
},
[200203]={
["desc"]="无影腿终结技可踢2次"
},
[200301]={
["desc"]="闪电鞭可与任何颜色链接"
},
[200302]={
["desc"]="被闪电鞭消除的元素造成的伤害提升10%"
},
[200303]={
["desc"]="闪电鞭随机消除元素增加2个"
},
[200401]={
["desc"]="金钟罩可与任何颜色链接"
},
[200402]={
["desc"]="增加金钟罩承受伤害10%"
},
[200403]={
["desc"]="生成的金钟罩额外持续1回合"
},
[200501]={
["desc"]="大鹏展翅左右可多消1格"
},
[200502]={
["desc"]="连接大鹏展翅伤害增加10%"
},
[200503]={
["desc"]="每有1个元素连接大鹏展翅则本回合格挡增加2%"
},
[200601]={
["desc"]="丹田吐纳可与任何元素连接"
},
[200602]={
["desc"]="连接丹田吐纳时伤害增加10%"
},
[200603]={
["desc"]="连接丹田吐纳的每一击都将恢复2%生命值"
},
[200701]={
["desc"]="疾风骤雨被连接时其上下左右4个元素变为金色元素"
},
[200702]={
["desc"]="连接疾风骤雨时伤害增加10%"
},
[200703]={
["desc"]="疾风骤雨被连接时周围8格元素变为金色元素"
},
[200801]={
["desc"]="寒冰掌被使用时可消除掉其上下左右4个元素"
},
[200802]={
["desc"]="连接寒冰掌时伤害增加10%"
},
[200803]={
["desc"]="冰霜效果将持续2回合"
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2f72f412e92f35f4eb512c4c02f98ac6
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7aca43fcabcd32044953d9f29afea299
guid: becd87bdbd6d3834b85a2956be498358
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1b1b37f2527d612468ac1ad7a73e896d
guid: 75a2c45cbe2bcfd4995b93096c253113
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e6ba105cda5bc02478caa3e378445c65
guid: 52043ed0a49b656479a6ec642f790696
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: a1e83d213f0bf634c8e97c6287c32ae7
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8bf8647e7bf0af44d9224c90bebf0d4a
guid: 1e5af6f47d2c6cb418798e94a47a8ccd
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 743e3966b9e4aea49a0232969885d99d
guid: 477210c4740714f43a95811bbf4d4353
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a265d8063aafee54ebd0693e1ea25c65
guid: 9ed23fb723c84bc4cbe22954d6b17a5a
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: c1d50c1fa2124c54699075edfe8eff89
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a0f0255a814325842a01892486ff9ea5
guid: d3dfc7227a3498740a7983c0b00d25c7
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 014caf639ac1aa04aa1072ef073cdab5
guid: 9961c77a5c2af2b4d9e3a2b571e30fb6
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 31a544a7c5108a74eb493a634b26c479
guid: 47f8c514724c20d47a92c9a1512ebb6b
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: bce0a949f9344044abc04bf571518479
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7a5750d8578ab8e43a2d9c167ad8e2fd
guid: 67c1ea18cf9128c49af5b691284c31e0
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e3cfacdb74649854fa9cea1813e20179
guid: 804e5fa17855dbb468e8655e257066d8
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c9c7950ff6c3d4245ae756cac96d38c7
guid: 5818c0136d578bf43b5ea61b3ee212a9
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: f74bda9166e39f945b09e4a2f8ac9dee
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 431d45043fea16340901881a7a8f1b81
guid: 61feda3ac6a7b5d499dfbbb2e6811309
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 986e227901251124895104dd99a07408
guid: ffbc5b9207088874682577f60b5697e7
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a3da81e2dacbd7f4bb3d3eda6efd5218
guid: c3c8d0c6a926f0946acac0aad625138f
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 77cbc4e16d24e194fba2e1bd4825b251
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 635985b190bbe5a4281cfab3482ce69c
guid: f15e8b1dac922444f89a67c359637b0c
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 778de7df0c85b71478f00f5fd98fd7f7
guid: 009437ba48b89324490538ab31edcebd
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3a51953f3abf899408c5745c025e3842
guid: 47433e8e0f6b71a4f91e25cd4f6ace44
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 4fa88b68e52f1514780f5faca9e3939f
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 14018193890e1f240afcc2128a57eb72
guid: f2c3ae422cb03ef498795afcfbac053e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e3773ebd5ee04124b8f345405eba73dd
guid: 0f30de0cd2d648c4286642d059262572
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 29b6dd5435799ca47a0f644b1807aac1
guid: 58b913ed5a2648440987f275ed61b547
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6abb68c472430b244a7e1b3043b994f0
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 418a8f3fe3b0ded489979df16eb9fecf
guid: 930044de16e90d14e8b3b1cd37b23a22
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3c07b2a7face40546a003517bdb018d2
guid: 6de16673704c042439caf14648e6d8e6
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1182037cb5052d94297f830afc5ba166
guid: c69db0ac47970c64f8d89ac40916afaf
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 97580252713cfea42897abc2f9bed5c7
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3770226eb2455b04f8467f9f323fdb87
guid: e4e609fcd9bbac647a363259925fc441
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3c5a67651188b5742b49a5635f5012cd
guid: 0141282daef9a9143a8e9add08e1879f
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ba2078397ee54ed49bc8801f9ff38ebb
guid: f487bcf921b9e484e8f04834d6272bc3
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 7e6a9c5cb3b3e8343bc36c2e8b812276
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: fba772890a396af4da6c731b5d9062cc
guid: 0fe9079a18f3469468a8e8c202206a78
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a40e485d70e3a304fa925e15a109a8f5
guid: 683945e4333147d43847e1eb5fcbcb03
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 642b41350e017604ba16c1111d002b9a
guid: e91da45666fe37b4aa1513858f184119
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 63d2861004eda134db732796e429f25a
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7d97ef3faaaa1f14faa75d5e55227eb0
guid: 2890ae09f7d346647b464c773206d852
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 87600f0b5a6c45541ab6bc8545775614
guid: 417e17ecd6e411d4b927e9f28e9915b1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d6a0e54a6636c064599a08a3fd8b07a8
guid: d928f2bb2c2b3db4e83ad5be7674af97
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,225 @@
local skill_rogue = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
},
[6]={
},
[7]={
},
[8]={
},
[9]={
},
[10]={
},
[11]={
},
[12]={
},
[13]={
},
[14]={
},
[15]={
},
[16]={
},
[17]={
},
[18]={
},
[19]={
},
[20]={
},
[21]={
},
[22]={
},
[23]={
},
[24]={
},
[25]={
},
[26]={
},
[27]={
},
[28]={
},
[29]={
},
[30]={
},
[31]={
},
[32]={
},
[33]={
},
[34]={
},
[35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
},
[41]={
},
[42]={
},
[43]={
},
[44]={
},
[45]={
},
[46]={
},
[47]={
},
[48]={
},
[49]={
},
[200101]={
},
[200102]={
},
[200103]={
},
[200201]={
},
[200202]={
},
[200203]={
},
[200301]={
},
[200302]={
},
[200303]={
},
[200401]={
},
[200402]={
},
[200403]={
},
[200501]={
},
[200502]={
},
[200503]={
},
[200601]={
},
[200602]={
},
[200603]={
},
[200701]={
},
[200702]={
},
[200703]={
},
[200801]={
},
[200802]={
},
[200803]={
}
}
local config = {
data=skill_rogue,count=73
}
return config

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 373384d818b25d14cbba31f3fa18ae30
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -4,11 +4,9 @@ local struct = {
["parameter2"]="id:int",
["parameter3"]="num:int"
},
["drop"]={
["parameter1"]="type:int",
["parameter2"]="id:int",
["parameter3"]="num:int",
["parameter4"]="weight:int"
["hero_drop"]={
["parameter1"]="id:int",
["parameter2"]="weight:int"
},
["boardrange"]={
["parameter1"]="type:int",

View File

@ -158,7 +158,7 @@ GConst.TYPEOF_LUA_CLASS = {
-- cell
ITEM_CELL = "app/ui/common/cell/item_cell",
EQUIP_CELL = "app/ui/common/cell/equip_cell",
HERO_CELL = "app/ui/common/cell/hero_cell",
REWARD_CELL = "app/ui/common/cell/reward_cell",
}
@ -370,84 +370,8 @@ GConst.ENTITY_TYPE = {
}
GConst.ATTR_TYPE = {
-- 血量
hp = 1,
-- 生命恢复
-- recover = 2,
-- 攻击
atk = 2,
-- 速度
-- spd = 4,
-- 暴击
crit = 3,
-- 暴击伤害
crit_time = 4,
-- 技能范围增加(百分比)
-- atk_range = 7,
-- 伤害减免,在伤害计算的最后按百分比减少
dmg_dec_all = 5,
-- 对boss的伤害提升
-- hurt_boss_time = 9,
-- 攻击力百分比
atkp_1 = 6,
atkp_2 = 7,
atkp_3 = 8,
atkp_4 = 9,
atkp_5 = 10,
atkp_6 = 11,
atkp_7 = 12,
atkp_8 = 13,
atkp_9 = 14,
-- 生命百分比
hpp_1 = 15,
hpp_2 = 16,
hpp_3 = 17,
hpp_4 = 18,
hpp_5 = 19,
hpp_6 = 20,
hpp_7 = 21,
-- 移动速度百分比
-- spdp = 25,
-- 增加自身的伤害
dmg_addition = 22,
-- 中毒伤害提高(比例)
-- hurt_poisonP = 27,
-- 对中毒单位伤害提高(比例)
-- dmg_addition_poicon = 28,
-- 闪避几率(受伤时有几率不掉血)
miss = 23,
-- 金币获取(百分比)
gold_gain = 24,
-- 技能伤害(百分比)
dmg_addition_skill = 25,
-- 普攻伤害(百分比)
dmg_addition_normal = 26,
-- 放置奖励(百分比)
idle_income = 27,
-- 矿镐回复速度(百分比)
pickaxe_recover_spd = 28,
-- 矿镐持有上限(固定值)
pickaxe_own_limit = 29,
-- 研究用矿石获取(百分比)
mineral_gain = 30,
-- 研究速度(百分比)
research_spd = 31,
-- 所有战斗中的攻击力百分比加成
-- atkp_0 = 38,
-- 击飞伤害
airborne_damage = 32,
-- 击飞数量
airborne_num = 33,
-- 所有技能的伤害提升
-- skill_all_damage = 41,
-- 武器技能1的伤害提升
-- skill_1_damage = 42,
-- -- 武器技能2的伤害提升
-- skill_2_damage = 43,
-- -- 武器技能3的伤害提升
-- skill_3_damage = 44,
-- -- 普攻伤害提升
-- attack_damage = 45,
}
GConst.GAMEOBJECT_LAYER = {

View File

@ -1694,6 +1694,30 @@ function GFunc.goTargetPosXShake(obj, onlyKill, targetX, offset, callBack)
return obj.shakeSeq
end
function GFunc.getRewardId(reward)
if reward.id_for_nothing then
return CS.BF.Utils.GetRewardNumber(reward.id_for_nothing)
else
return reward.id
end
end
function GFunc.getRewardNum(reward)
if reward.num_for_nothing then
return CS.BF.Utils.GetRewardNumber(reward.num_for_nothing)
else
return reward.num
end
end
function GFunc.getRewardType(reward)
if reward.type_for_nothing then
return CS.BF.Utils.GetRewardNumber(reward.type_for_nothing)
else
return reward.type
end
end
--[[
tabLe只速 Lua error
locaL readOnlyCfg = GFunc.readOnlyTab(cfg) return readOnlyCfg

View File

@ -27,13 +27,17 @@ function TestLoginUI:onLoadRootComplete()
self.progressTx = uiMap["test_login_ui.progress_tx"]
self.progressTx:setText("")
self.inputField = uiMap["test_login_ui.login_node.input_field"]:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_INPUT_FIELD)
self.inputField.text = LocalData:getLastLoginName()
self.inputField.text = LocalData:getDistinctId()
uiMap["test_login_ui.loading_text"]:setText(I18N:getGlobalText(I18N.GlobalConst.LOADING_DESC))
uiMap["test_login_ui.copy_account_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_COPY_ACOUNT_DESC))
uiMap["test_login_ui.login_node.login_btn.text"]:setText(I18N:getGlobalText(I18N.GlobalConst.TURNTABLE_BUTTON))
uiMap["test_login_ui.login_node.login_btn"]:addClickListener(function()
Logger.logHighlight("------")
if not self.inputField.text or self.inputField.text == "" then
GFunc.showToast("请输入账号")
return
end
LocalData:setDistinctId(self.inputField.text)
self:loginGame()
end)

View File

@ -0,0 +1,67 @@
local ServerBagData = class("ServerBagData", ServerBaseData)
function ServerBagData:ctor()
self.ItemData = require("app/server/data/server_item_data"):create()
end
function ServerBagData:loadLocalData()
self.ItemData:loadLocalData()
end
function ServerBagData:clear()
self.ItemData:clear()
end
function ServerBagData:getItemData()
return self.ItemData:getAllItems()
end
function ServerBagData:tryAddItem(id, num)
return self.ItemData:tryAddItem(id, num)
end
function ServerBagData:tryAddItemReward(item)
local id = GFunc.getRewardId(item)
local num = GFunc.getRewardNum(item)
return self.ItemData:tryAddItem(id, num)
end
function ServerBagData:tryAddItemCost(cost)
local id = GFunc.getRewardId(cost)
local num = GFunc.getRewardNum(cost)
return self.ItemData:tryAddItem(id, -num)
end
function ServerBagData:addItemReward(item, getType)
local id = GFunc.getRewardId(item)
local num = GFunc.getRewardNum(item)
self:addItem(id, num, getType)
end
function ServerBagData:addItemCost(cost)
local id = GFunc.getRewardId(cost)
local num = GFunc.getRewardNum(cost)
self:addItem(id, -num)
end
function ServerBagData:addItem(id, num, getType)
if id == GConst.ItemConst.ITEM_ID_VIT then
local maxCount = self.ItemData:getMaxVit()
local currentCount = self.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_VIT)
local isMax = currentCount >= maxCount
self.ItemData:addItem(id, num, getType)
local currentCount = currentCount + num
local isMax1 = currentCount >= maxCount
if not isMax1 then
if isMax then
self.ItemData:resetVitRecoverTime()
else
self.ItemData:recoveryItems()
end
end
else
self.ItemData:addItem(id, num, getType)
end
end
return ServerBagData

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: d136d1a130b633146aadeca89f6c41a6
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -2,52 +2,34 @@ local ServerBaseData = class("ServerBaseData")
function ServerBaseData:ctor(...)
self.data = {}
self.data.__parent = self
-- self.data.__parent = self
local innerData = nil
innerData = {
__index = function (t, key)
return innerData[key]
end,
__newindex = function (t, key, value)
innerData[key] = value
end
}
setmetatable(self.data, innerData)
-- local innerData = nil
-- innerData = {
-- __index = function (t, key)
-- return innerData[key]
-- end,
-- __newindex = function (t, key, value)
-- innerData[key] = value
-- end
-- }
-- setmetatable(self.data, innerData)
end
function ServerBaseData:_loadLocalData()
local data = LocalData:getString("ServerBaseData_" .. self.__cname, "")
local innerData = getmetatable(self.data)
function ServerBaseData:init()
end
function ServerBaseData:loadLocalData()
local data = LocalData:getString("ServerData_" .. self.__cname, "")
local dataObj = nil
if data and data ~= "" then
dataObj = json.decode(data)
end
for k, v in pairs(innerData) do
innerData[k] = nil
end
if dataObj then
for k, v in pairs(dataObj) do
innerData[k] = v
end
end
self:init(dataObj)
end
function ServerBaseData:_loadNewPlayerData()
local innerData = getmetatable(self.data)
for k, v in pairs(innerData) do
innerData[k] = nil
end
local dataObj = self:getNewPlayerData()
if dataObj then
for k, v in pairs(dataObj) do
innerData[k] = v
end
end
end
function ServerBaseData:getNewPlayerData()
return nil
function ServerBaseData:loadNewPlayerData()
self:init()
end
function ServerBaseData:getCloneData()
@ -65,8 +47,7 @@ function ServerBaseData:getCloneData()
end
return newObject
end
local innerData = getmetatable(self.data)
return _copy(innerData)
return _copy(self.data)
end
function ServerBaseData:clone()

View File

@ -0,0 +1,10 @@
local ServerChapterData = class("ServerChapterData", ServerBaseData)
local MIN_CHAPTER_ID = 1
function ServerChapterData:init(data)
self.data.chapterId = data and data.chapterId or MIN_CHAPTER_ID
self.data.maxChapterId = data and data.maxChapterId or (self.data.chapterId - 1)
end
return ServerChapterData

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 58e11526da53ab84da05ed5fd3a6cf31
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -0,0 +1,3 @@
local ServerHeroData = class("ServerHeroData", ServerBaseData)
return ServerHeroData

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 56a4a8f5d6118d74b9bb6971db3d030a
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -0,0 +1,183 @@
local ServerItemData = class("ServerItemData", ServerBaseData)
function ServerItemData:init(data)
data = data or {}
self.data.items = {}
for idStr, item in pairs(data) do
local id = tonumber(idStr)
if id == GConst.ItemConst.ITEM_ID_VIT then
local ServerGameData = require "app/server/data/server_game_data"
ServerGameData.PlayerData:setVit(item.count)
end
self.data.items[id] = {cfg_id = id, count = item.count}
end
self.data.recoveries = data.recoveries or {}
self:checkRecoveries()
end
function ServerItemData:tryAddItem(id, num)
if not self.data.items[id] then
if num < 0 then
return false
end
else
if self.data.items[id].count + num < 0 then
return false
end
end
return true
end
function ServerItemData:addItem(id, num, getType)
local hadNum = 0
if self.data.items[id] then
hadNum = self.data.items[id].count
else
self.data.items[id] = {}
self.data.items[id].cfg_id = id
self.data.items[id].count = 0
end
local finalNum = (hadNum or 0) + num
if finalNum < 0 then
finalNum = 0
end
local ServerGameData = require "app/server/data/server_game_data"
if id == GConst.ItemConst.ITEM_ID_VIT then
ServerGameData.PlayerData:setVit(finalNum)
end
self.data.items[id].count = finalNum
if num < 0 then
if id == GConst.ItemConst.ITEM_ID_GEM then
ServerGameData.TaskData:addTaskProgress(GConst.TASK_TYPE.TASK_GEM_COST, -num)
end
end
getType = getType or ""
if num > 0 and id == GConst.ItemConst.ITEM_ID_GOLD and
getType ~= GConst.ServerDataConst.DATA_OP_BEHAVIOR.EQUIP_RESOLVE and
getType ~= GConst.ServerDataConst.DATA_OP_BEHAVIOR.EQUIP_REBACK then
ServerGameData.TaskData:addTaskProgress(GConst.TASK_TYPE.TASK_GOLD_GET, num)
end
end
function ServerItemData:getAllItems()
return self.data.items
end
function ServerItemData:getItemNumById(id)
if not self.data.items[id] then
return 0
end
local num = self.data.items[id].count or 0
return num
end
function ServerItemData:checkRecoveries()
local recoveryCfg = self:getRecoveryCfg()
for k, v in pairs(recoveryCfg) do
local inList = false
for ii, vv in ipairs(self.data.recoveries) do
if vv.cfg_id == k then
inList = true
end
end
if not inList then
table.insert(self.data.recoveries, {cfg_id = k, ts = Time:getServerTime()})
end
end
self:recoveryItems()
end
function ServerItemData:recoveryItems()
if not self.data.recoveries then
return
end
for i,v in ipairs(self.data.recoveries) do
if v.cfg_id == GConst.ItemConst.ITEM_ID_VIT then
local maxCount = self:getMaxVit()
self:recoveryItem(v, maxCount)
end
end
end
function ServerItemData:recoveryItem(data, maxCount)
if not CS.BF.BFMain.IsGotServerTime then
return
end
if data.cfg_id == GConst.ItemConst.ITEM_ID_VIT then
local ServerGameData = require "app/server/data/server_game_data"
local currentCount = ServerGameData.PlayerData:getVit()
if currentCount >= maxCount then -- 已经达到上限
return
end
local cfg = self:getRecoveryCfg()[data.cfg_id]
local nowTime = Time:getServerTime()
local diffTime = nowTime - data.ts
if diffTime <= 0 then
return
end
local addCount = math.floor(diffTime / cfg.time)
if addCount <= 0 then
return
end
end
local currentCount = self:getItemNumById(data.cfg_id)
if currentCount >= maxCount then -- 已经达到上限
return
end
local cfg = self:getRecoveryCfg()[data.cfg_id]
local nowTime = Time:getServerTime()
local diffTime = nowTime - data.ts
if diffTime <= 0 then
return
end
local addCount = math.floor(diffTime / cfg.time)
if addCount <= 0 then
return
end
data.ts = data.ts + cfg.time*addCount
if currentCount + addCount > maxCount then
addCount = maxCount - currentCount
end
self:addItem(data.cfg_id, addCount)
ServerDataManager:saveData()
end
function ServerItemData:resetVitRecoverTime()
local maxCount = self:getMaxVit()
local ServerGameData = require "app/server/data/server_game_data"
local currentCount = ServerGameData.PlayerData:getVit()
if currentCount >= maxCount then -- 已经达到上限
return
end
local currentCount = self:getItemNumById(GConst.ItemConst.ITEM_ID_VIT)
if currentCount >= maxCount then -- 已经达到上限
return
end
for i,v in ipairs(self.recoveries) do
if v.cfg_id == GConst.ItemConst.ITEM_ID_VIT then
self.data.recoveries[i].ts = Time:getServerTime()
end
end
end
function ServerItemData:getRecoveryCfg()
if self.recoveryCfg == nil then
self.recoveryCfg = ConfigManager:getConfig("recovery")
end
return self.recoveryCfg
end
function ServerItemData:getMaxVit()
if self.maxVit == nil then
local cfg = self:getRecoveryCfg()[GConst.ItemConst.ITEM_ID_VIT]
self.maxVit = cfg.limit
end
return self.maxVit
end
return ServerItemData

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 21a3f0972e236154197f14df6f246f40
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,5 +1,9 @@
local ServerDataConst = {}
ServerDataConst.REWARD_TYPE = {
REWARD_NONE = 0,
ITEM = 1,
}
ServerDataConst.DATA_OP_BEHAVIOR = {
SYNC_DATA = "SYNC_DATA",

View File

@ -5,6 +5,32 @@ local ServerDataManager = {}
function ServerDataManager:init()
end
function ServerDataManager:saveData()
end
function ServerDataManager:randomReward(weightArr, callback)
local maxWeight = 0
for i, v in ipairs(weightArr) do
maxWeight = maxWeight + v
end
local randomWeight
if callback then
randomWeight = callback(1, maxWeight)
else
randomWeight = math.random(1, maxWeight)
end
local idx
for i, v in ipairs(weightArr) do
if randomWeight <= v then
idx = i
break
else
randomWeight = randomWeight - v
end
end
return idx
end
function ServerDataManager:dataOperate(behavior, params, callback)
local opFunc = ServerDataManager.OP_FUNC[behavior]
if opFunc then

View File

@ -1,4 +1,8 @@
local ServerGameData = {}
local ServerGameData = {
seed = {}
}
local TempRewards = {}
function ServerGameData:init()
if self.isInit then
@ -6,19 +10,33 @@ function ServerGameData:init()
end
self.isInit = true
self:initServerData("PlayerData", "app/server/data/server_player_data")
self:initServerData("BagData", "app/server/data/server_bag_data")
self:initServerData("HeroData", "app/server/data/server_hero_data")
self:initServerData("ChapterData", "app/server/data/server_chapter_data")
end
function ServerGameData:initData()
self:init()
if self.distinctId == nil or self.distinctId == "" then
self.distinctId = LocalData:getDistinctId()
end
local isNewPlayer = LocalData:getIsNewPlayer()
if isNewPlayer then
for k, v in pairs(self.dataMap) do
v:_loadNewPlayerData()
v:loadNewPlayerData()
end
local playerInitialCfg = ConfigManager:getConfig("player_initial")
if playerInitialCfg then
for k, v in pairs(playerInitialCfg) do
if v.reward then
self:addReward(v.reward)
end
end
end
LocalData:setNotNewPlayer()
else
for k, v in pairs(self.dataMap) do
v:_loadLocalData()
v:loadLocalData()
end
end
end
@ -39,4 +57,136 @@ function ServerGameData:getData()
return data
end
-- 根据配置表添加奖励
function ServerGameData:addRewards(cfgRewards, getType)
local rewards = {}
if cfgRewards then
local count = #TempRewards
for i = 1, count do
table.remove(TempRewards)
end
for _, reward in ipairs(cfgRewards) do
local rewardType = GFunc.getRewardType(reward)
if rewardType == GConst.ServerDataConst.REWARD_TYPE.ITEM then
local rewardId = GFunc.getRewardId(reward)
local rewardNum = GFunc.getRewardNum(reward)
local cfg = ConfigManager:getItemConfig()[rewardId]
if cfg.box_drop then
self:openRewardBox(TempRewards, cfg.box_drop, rewardNum, rewardId)
else
table.insert(TempRewards, reward)
end
else
table.insert(TempRewards, reward)
end
end
count = #TempRewards
for i = 1, count do
local reward = table.remove(TempRewards)
local newReward = self:getNewReward()
local rewardType = GFunc.getRewardType(reward)
newReward.type = rewardType
if rewardType == GConst.ServerDataConst.REWARD_TYPE.ITEM then
self.BagData:addItemReward(reward, getType)
local rewardId = GFunc.getRewardId(reward)
local rewardNum = GFunc.getRewardNum(reward)
if rewardId == GConst.ItemConst.ITEM_ID_EXP then
self.PlayerData:addExp(rewardNum)
end
local item = self:getNewItem()
item.cfg_id = rewardId
item.count = rewardNum
newReward.item = item
end
table.insert(rewards, newReward)
end
end
return rewards
end
function ServerGameData:addRewards(cfgReward, getType)
if cfgReward == nil then
return
end
local count = #TempRewards
for i = 1, count do
table.remove(TempRewards)
end
local rewardType = GFunc.getRewardType(cfgReward)
if rewardType == GConst.ServerDataConst.REWARD_TYPE.ITEM then
local rewardId = GFunc.getRewardId(cfgReward)
local rewardNum = GFunc.getRewardNum(cfgReward)
local cfg = ConfigManager:getItemConfig()[rewardId]
if cfg.box_drop then
self:openRewardBox(TempRewards, cfg.box_drop, rewardNum, rewardId)
else
table.insert(TempRewards, cfgReward)
end
else
table.insert(TempRewards, cfgReward)
end
count = #TempRewards
for i = 1, count do
local reward = table.remove(TempRewards)
local rewardType = GFunc.getRewardType(reward)
if rewardType == GConst.ServerDataConst.REWARD_TYPE.ITEM then
self.BagData:addItemReward(reward, getType)
local rewardId = GFunc.getRewardId(reward)
local rewardNum = GFunc.getRewardNum(reward)
if rewardId == GConst.ItemConst.ITEM_ID_EXP then
self.PlayerData:addExp(rewardNum)
end
end
end
end
function ServerGameData:getNewReward()
local rewards = {
type = 0,
item = {},
}
return rewards
end
function ServerGameData:getNewItem()
local item = {
cfg_id = 0,
count = 0
}
return item
end
function ServerGameData:openRewardBox(finalReward, drop, num, id)
local weightArr = {}
for _, v in ipairs(drop) do
table.insert(weightArr, v.weight)
end
for i = 1, num do
local rewardIdx = ServerDataManager:randomReward(weightArr, function (min, max)
return ServerGameData:randomItemBox(id, min, max)
end)
table.insert(finalReward, drop[rewardIdx])
end
end
function ServerGameData:randomItemBox(id, min, max)
id = tostring(id)
local seed = self.seed[id]
if not seed then
local str = self.distinctId .. "_ItemBox_" .. id
seed = GFunc.hash(str)
self.seed[id] = seed
end
self.seed[id] = (seed*9301 + 49297)%233280
return min + self.seed[id]*(max - min + 1)//233280
end
function ServerGameData:getDistinctId()
return self.distinctId
end
function ServerGameData:setDistinctId(distinctId)
self.distinctId = distinctId
end
return ServerGameData

View File

@ -0,0 +1,6 @@
local HeroCell = class("HeroCell", BaseCell)
function HeroCell:refresh()
end
return HeroCell

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2908445d9bae05b4fad51ac5eca0730e
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -54,7 +54,6 @@ end
function ToastManager:_showToast(params)
UIManager:getToast(function(prefabObject)
AudioManager:playEffect(AudioManager.EFFECT_ID.SFX_TOAST)
prefabObject._using = true
if prefabObject._toastSequence then
prefabObject._toastSequence:Kill()

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d83268e262de62e478d7dd155698ccce
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,43 @@
local HeroListCell = class("HeroListCell", BaseCell)
local H = {
NORMAL = 112,
HAS_TITLE = 216
}
function HeroListCell:init()
self.uiMap = self:getUIMap()
self.heroCells = {
self.uiMap["hero_list_cell.prop_node.hero_cell_1"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL),
self.uiMap["hero_list_cell.prop_node.hero_cell_2"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL),
self.uiMap["hero_list_cell.prop_node.hero_cell_3"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL),
self.uiMap["hero_list_cell.prop_node.hero_cell_4"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL),
self.uiMap["hero_list_cell.prop_node.hero_cell_5"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.HERO_CELL),
}
self.title = self.uiMap["hero_list_cell.title"]
self.titleTx = self.uiMap["hero_list_cell.title.title_desc"]
end
function HeroListCell:refresh(list)
-- for i, cell in ipairs(self.heroCells) do
-- local info = list.unitList and list.unitList[i]
-- cell:getBaseObject():setActive(info ~= nil)
-- if info and info.entity then
-- cell:refresh(info.entity)
-- end
-- end
-- self.title:setActive(list.showTitle ~= nil)
-- if list.showTitle ~= nil then
-- self.titleTx:setText(list.showTitle)
-- self:getBaseObject():setSizeDeltaY(H.HAS_TITLE)
-- else
-- local h = H.NORMAL
-- if list.isFirstLine then
-- h = h + 30
-- end
-- self:getBaseObject():setSizeDeltaY(h)
-- end
end
return HeroListCell

View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 65cefb44eced49b4ab01c650f89e976b
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

View File

@ -1,6 +1,46 @@
local HeroComp = class("HeroComp", LuaComponent)
local HERO_LIST_CELL = "app/ui/hero/cell/hero_list_cell"
function HeroComp:init()
self.uiMap = self:getBaseObject():genAllChildren()
self.scrollRect = self.uiMap["hero_ui.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
self.scrollRect:addInitCallback(function()
return HERO_LIST_CELL
end)
self.scrollRect:addRefreshCallback(function(index, cell)
cell:refresh()
end)
self.heroList = {}
end
function HeroComp:refresh()
if #self.heroList <= 0 then
local heroes = DataManager.HeroData:getAllHeroes()
for k, v in pairs(heroes) do
table.insert(self.heroList, v)
end
end
self:refreshScrollRect()
end
function HeroComp:refreshScrollRect()
local activeCount = DataManager.HeroData:getActiveHeroCount()
local lockCount = #self.heroList - activeCount
local cellCount = 0
if activeCount > 0 then
cellCount = cellCount + math.ceil(activeCount / 5)
end
if lockCount > 0 then
cellCount = cellCount + math.ceil(lockCount / 5)
end
local currCount = self.scrollRect:getTotalCount()
if cellCount == currCount then
self.scrollRect:updateAllCell()
else
self.scrollRect:clearCells()
self.scrollRect:refillCells(cellCount)
end
end
return HeroComp

View File

@ -1,507 +1,62 @@
local MainComp = class("MainComp", LuaComponent)
local BG_PREFIX = "assets/arts/textures/background/chapter/%s.png"
local PATTERN_ICON = {
[GConst.StageConst.CHAPTER_PATTERN.HARD] = {"common_menu_6", "common_decoration_16"},
[GConst.StageConst.CHAPTER_PATTERN.NORMAL] = {"common_menu_7", "common_decoration_15"}
}
local CHAPTER_PATH = "assets/arts/textures/background/chapter/%s.png"
function MainComp:refresh(childPage)
self.childPage = childPage
self.showLeftRed = false
self.showRightRed = false
self.showLeftSideBar = true
self.showRightSideBar = true
-- self:_display()
self:_addListeners()
function MainComp:init()
self.uiMap = self:getBaseObject():genAllChildren()
self:initChapter()
self:initGM()
end
function MainComp:_display()
local uiMap = self:getBaseObject():genAllChildren()
function MainComp:initChapter()
self.chapterImg = self.uiMap["main_comp.chapter.img"]
self.chapterNameTx = self.uiMap["main_comp.chapter.name_tx"]
self.leftArrow = self.uiMap["main_comp.chapter.left_arrow"]
self.leftArrow:addClickListener(function()
if DataManager.ChapterData:goLastChapter() then
self:refresh()
end
end)
self.rightArrow = self.uiMap["main_comp.chapter.right_arrow"]
self.rightArrow:addClickListener(function()
if DataManager.ChapterData:goNextChapter() then
self:refresh()
end
end)
local fightBtn = self.uiMap["main_comp.fight_btn"]
fightBtn:addClickListener(function()
self:onFightBtnClick()
end)
end
self.rightSideBarBg = uiMap["main_comp.right_node"]
self.leftSideBarBg = uiMap["main_comp.left_node"]
self.leftArrow = uiMap["main_comp.left_node.arrow"]
self.rightArrow = uiMap["main_comp.right_node.arrow"]
-- 宝箱相关
self.boxImg = uiMap["main_comp.box_touch_1"]
self.boxImgShadow = uiMap["main_comp.box_touch_1_shadow"]
self.boxShakeImg = uiMap["main_comp.box_touch_1.box_shakeImg"]
self.boxTx = uiMap["main_comp.box_tx"]
self.boxImgShadow:setActive(false)
self.boxImgShadow:setLocalScale(0.8,0.8,0.8)
self:refreshBoxShakeEff(true)
self.btnGM = uiMap["main_comp.gm_btn"]
self.btnGM:setVisible(not Platform:getIsPublishChannel(),2)
function MainComp:initGM()
self.btnGM = self.uiMap["main_comp.gm_btn"]
self.btnGM:setVisible(not Platform:getIsPublishChannel(), 2)
self.btnGM:addClickListener(function()
ModuleManager.DevToolManager:showOrHideDevListUI()
end)
-- self:refreshChapter()
-- self:refreshRedPoint()
end
function MainComp:_addListeners()
local uiMap = self:getBaseObject():genAllChildren()
-- 战斗按钮
uiMap["main_comp.hang_up_node.fight_btn"]:addClickListener(function()
self:onFightBtnClick()
end)
function MainComp:refresh()
self:refreshChapter()
end
function MainComp:onFightBtnClick()
ModuleManager.BattleManager:playBattle(nil, GConst.BattleConst.BATTLE_TYPE.STAGE)
end
function MainComp:onClickPattern()
local chapterId = DataManager.StageData:getChapterId()
local pattern = DataManager.StageData:getChapterPattern(chapterId)
if self.childPage then
pattern = self.childPage
self.childPage = nil
elseif pattern == GConst.StageConst.CHAPTER_PATTERN.HARD then
pattern = GConst.StageConst.CHAPTER_PATTERN.NORMAL
else
pattern = GConst.StageConst.CHAPTER_PATTERN.HARD
end
local maxId = DataManager.StageData:getMaxChapterId(pattern)
local maxCfg = ConfigManager:getConfig("chapter")[maxId]
if maxCfg and maxCfg.next_chapter then
maxId = maxCfg.next_chapter
elseif not maxCfg and pattern == GConst.StageConst.CHAPTER_PATTERN.HARD then
maxId = DataManager.StageData:getDefaultHardId()
elseif not maxCfg then
maxId = DataManager.StageData:getDefaultId()
end
DataManager.StageData:changeChapterId(maxId)
self:_display()
end
function MainComp:refreshChapter()
local curId = DataManager.StageData:getChapterId()
local pattern = DataManager.StageData:getChapterPattern(curId)
local cfg = ConfigManager:getConfig("chapter")[curId]
local uiMap = self:getBaseObject():genAllChildren()
self:initHardChapterUI(uiMap, pattern, cfg)
self:initFightBtn(uiMap, cfg.cost)
self:setChapterTxtUI(uiMap, curId)
uiMap["main_comp.box_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CHAPTER_BOX_TITLE))
uiMap["main_comp.chapter_img"]:setTexture(string.format(BG_PREFIX, cfg.scenes.."_main"))
self:refreshBoxShakeEff()
end
--endregion
--region UI初始化
function MainComp:refreshBoxShakeEff(onlyKill)
self.boxShakeImg:setLocalRotation(0,0,0)
-- GFunc.getShakeSeqRotate(self.boxShakeImg,nil)
end
function MainComp:initFightBtn(uiMap,cost)
local btnTx = I18N:getGlobalText(I18N.GlobalConst.CONTINUE_DESC)
uiMap["main_comp.hang_up_node.fight_btn.desc"]:setText(btnTx)
uiMap["main_comp.hang_up_node.fight_btn.desc_2"]:setText(cost)
end
function MainComp:initHardChapterUI(uiMap, pattern, cfg)
--暂时屏蔽困难按钮
if true then
uiMap["main_comp.hard_btn"]:setVisible(false)
return
local chapterId = DataManager.ChapterData:getChapterId()
if self.currChapterId ~= chapterId then
self.currChapterId = chapterId
local chapterInfo = ConfigManager:getConfig("chapter")[chapterId]
local chapterI18NInfo = I18N:getConfig("chapter")[chapterId]
if chapterInfo then
self.chapterImg:setTexture(string.format(CHAPTER_PATH, chapterInfo.icon))
end
local hardBtn = uiMap["main_comp.hard_btn"]
local atmosphereNode = uiMap["main_comp.atmosphere_node"]
atmosphereNode:setVisible(false)
if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.HARD_STAGE, true) then
hardBtn:setVisible(true)
local text = uiMap["main_comp.hard_btn.desc"]
local kulou = uiMap["main_comp.hard_btn.kulo_img"]
if pattern == GConst.StageConst.CHAPTER_PATTERN.NORMAL then
atmosphereNode:setVisible(false)
text:setText(I18N:getGlobalText(I18N.GlobalConst.HARD_DESC))
elseif pattern == GConst.StageConst.CHAPTER_PATTERN.HARD then
atmosphereNode:setVisible(true)
text:setText(I18N:getGlobalText(I18N.GlobalConst.SIMPLY_DESC))
if cfg and cfg.scenes_a then
uiMap["main_comp.atmosphere_node.top"]:setTexture("assets/arts/textures/background/main/" .. cfg.scenes_a .. ".png")
if chapterI18NInfo then
self.chapterNameTx:setText(chapterI18NInfo.name)
end
end
if PATTERN_ICON[pattern] then
hardBtn:setSprite(GConst.ATLAS_PATH.COMMON, PATTERN_ICON[pattern][1])
kulou:setSprite(GConst.ATLAS_PATH.COMMON, PATTERN_ICON[pattern][2])
end
else
hardBtn:setVisible(false)
end
end
function MainComp:setChapterTxtUI(uiMap,curChapterId)
uiMap["main_comp.chapter_name"]:setText(I18N:getConfig("chapter")[curChapterId].name)
local chapterPassedTx = uiMap["main_comp.chapter_passed"]
local info = DataManager.StageData:getChapterInfo(curChapterId)
local content = ""
if info.passed then
content = I18N:getGlobalText(I18N.GlobalConst.ALREADY_PASS_DESC)
else
local wave = info.bestWave or 0
content = I18N:getGlobalText(I18N.GlobalConst.PASS_DESC_2, wave.."/"..self:getMaxWave())
end
chapterPassedTx:setText(content)
end
function MainComp:getMaxWave()
local chapterId = DataManager.StageData:getChapterId()
self.generateSteps = DataManager.StageData:getChapterGenMonsterSteps(chapterId) or GConst.EMPTY_TABLE
self.generateChapterCfg = ConfigManager:getConfig("chapter")[chapterId]
self.generateStageCfg = ConfigManager:getConfig("story_stage")
local maxWave = 0
for i,v in ipairs(self.generateChapterCfg.stage) do
local stageCfg = self.generateStageCfg[v]
if stageCfg and stageCfg.wave_type ~= GConst.BattleConst.STEP_TYPE.ROUGE and not stageCfg.is_tutorial then
maxWave = maxWave + 1
end
end
return maxWave
end
function MainComp:calcLeftBarIconPos(leftNum)
local maxColumnNum = self:getMaxColumnNum()
local w = 104
local h = 0
local showArrow = false--leftNum > 2
if leftNum <= maxColumnNum then
if showArrow then
h = 104 * leftNum + 84
else
h = 104 * leftNum + 28
end
else
w = 208
h = 104 * maxColumnNum
end
self.leftArrow:removeRedPoint()
if not self.showLeftSideBar then
if leftNum > 2 then
h = 104 + 84
else
h = 104 + 28
end
if self.showLeftRed then
self.leftArrow:addRedPoint(12, 8, 0.5)
end
end
self.leftArrow:setAnchoredPositionX(47)
if leftNum <= maxColumnNum or not self.showLeftSideBar then
self.leftArrow:setAnchoredPositionX(0)
end
self.leftArrow:setActive(showArrow)
self.leftSideBarBg:setSizeDelta(w, h)
if leftNum <= 0 then
self.leftSideBarBg:setVisible(false)
else
self.leftSideBarBg:setVisible(true)
end
end
function MainComp:calcRightBarIconPos(rightNum)
local maxColumnNum = self:getMaxColumnNum()
local w = 104
local h = 0
local showArrow = false--rightNum > 2
if rightNum <= maxColumnNum then
if showArrow then
h = 104 * rightNum + 84
else
h = 104 * rightNum + 28
end
else
w = 208
h = 104 * maxColumnNum
end
self.rightArrow:removeRedPoint()
if not self.showRightSideBar then
w = 104
if rightNum > 2 then
h = 104 + 84
else
h = 104 + 28
end
if self.showRightRed then
self.rightArrow:addRedPoint(12, 8, 0.5)
end
end
self.rightArrow:setAnchoredPositionX(-47)
if rightNum <= maxColumnNum or not self.showRightSideBar then
self.rightArrow:setAnchoredPositionX(0)
end
self.rightArrow:setVisible(showArrow)
self.rightSideBarBg:setSizeDelta(w, h)
if rightNum <= 0 then
self.rightSideBarBg:setVisible(false)
else
self.rightSideBarBg:setVisible(true)
end
end
function MainComp:getMaxColumnNum()
if not self.maxColumnNum then
local screenOffsetY = GFunc.calculateFitSizeY()
self.maxColumnNum = 5 + screenOffsetY // 104
end
return self.maxColumnNum
end
function MainComp:getSideBtnPos(btnNum, offsetY, isRight)
local x = 0
local y = offsetY
local maxColumnNum = self:getMaxColumnNum()
btnNum = btnNum + 1
if btnNum < maxColumnNum then
offsetY = offsetY - 104
else
local num = btnNum - maxColumnNum
if num > 0 then
if not isRight then
x = 99
else
x = -99
end
end
offsetY = -47.5 - num * 104
end
return offsetY, btnNum, x, y
end
function MainComp:initFirstRechargeUI(offsetLy, leftNum, x, y)
-- 首充礼包
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.FIRST_CHARGE, true) or DataManager.ActivityGiftData:isFirstGiftClaimed() then
GFunc.getShakeSeq(self.firstRechargeBtn, true)
self.firstRechargeBtn:setVisible(false)
else
if (not DataManager.ActivityGiftData:getCheckUI(GConst.ActivityConst.CHECK_UI.firstRecharge)) and self.showLeftSideBar then
GFunc.getShakeSeq(self.firstRechargeBtn, nil, 1, true)
else
GFunc.getShakeSeq(self.firstRechargeBtn, true)
end
offsetLy, leftNum, x, y = self:getSideBtnPos(leftNum, offsetLy)
self.firstRechargeBtn:setVisible(true)
if (not self.showLeftSideBar) and leftNum > 1 then
self.firstRechargeBtn:setVisible(false)
end
self.firstRechargeBtn:setAnchoredPosition(x, y)
end
return offsetLy, leftNum, x, y
end
function MainComp:initDcBtnUI(offsetLy, leftNum, x, y)
if CS.BF.BFMain.IsShenhe then
return offsetLy, leftNum, x, y
end
offsetLy, leftNum, x, y = self:getSideBtnPos(leftNum, offsetLy)
self.dcBtn:setVisible(true)
if (not self.showLeftSideBar) and leftNum > 1 then
GFunc.getShakeSeqRotate(self.dcIcon,true)
self.dcBtn:setVisible(false)
else
GFunc.getShakeSeqRotate(self.dcIcon,nil, true)
end
self.dcBtn:setAnchoredPosition(x, y)
return offsetLy, leftNum, x, y
end
--endregion
--region 右侧按钮排版
function MainComp:initLvCardUI(offsetY, rightNum, x, y)
-- 成长基金
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_LEVEL_GIFT, true) or DataManager.ActivityGiftData:isLvGiftFinish() then
GFunc.getShakeSeq(self.lvGiftBtn, true)
self.lvGiftBtn:setVisible(false)
else
if (not DataManager.ActivityGiftData:isLvGiftOpen()) and self.showRightSideBar then
if not DataManager.ActivityGiftData:getCheckUI(GConst.ActivityConst.CHECK_UI.lvGift) then
GFunc.getShakeSeq(self.lvGiftBtn, nil, 1, true)
else
GFunc.getShakeSeq(self.lvGiftBtn, true)
end
else
if DataManager.ActivityGiftData:showLvGiftRedPoint() and self.showRightSideBar then
GFunc.getShakeSeq(self.lvGiftBtn, nil, 1, true)
else
GFunc.getShakeSeq(self.lvGiftBtn, true)
end
end
offsetY, rightNum, x, y = self:getSideBtnPos(rightNum, offsetY, true)
self.lvGiftBtn:setVisible(true)
if (not self.showRightSideBar) and rightNum > 1 then
self.lvGiftBtn:setVisible(false)
end
self.lvGiftBtn:setAnchoredPosition(x, y)
end
return offsetY, rightNum, x, y
end
function MainComp:initTaskUI(offsetY, rightNum, x, y)
if CS.BF.BFMain.IsShenhe then
self.taskBtn:setActive(false)
self.boxImg:setAnchoredPositionX(0)
self.boxTx:setAnchoredPositionX(0)
self.boxImgShadow:setAnchoredPositionX(0)
return offsetY, rightNum, x, y
end
-- 任务 开启后常驻
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TASK, true) then
GFunc.getShakeSeq(self.taskBtn, true)
self.taskBtn:setVisible(false)
else
if DataManager.TaskData:showRedPoint() and self.showRightSideBar then
GFunc.getShakeSeq(self.taskBtn, nil, 1, true)
else
GFunc.getShakeSeq(self.taskBtn, true)
end
offsetY, rightNum, x, y = self:getSideBtnPos(rightNum, offsetY, true)
self.taskBtn:setVisible(true)
if (not self.showRightSideBar) and rightNum > 1 then
self.taskBtn:setVisible(false)
end
self.taskBtn:setAnchoredPosition(x, y)
end
return offsetY, rightNum, x, y
end
function MainComp:initPopGiftUI(offsetY, rightNum, x, y)
if #self.popData <= 0 then
GFunc.getShakeSeq(self.popGiftBtn, true)
self.popGiftBtn:setVisible(false)
else
self.popGiftBtn:setVisible(true)
self.popGiftBtn:setAnchoredPositionY(offsetY)
if #self.popData > 0 then
GFunc.getShakeSeq(self.popGiftBtn, nil, 1, true)
else
GFunc.getShakeSeq(self.popGiftBtn, true)
end
offsetY, rightNum, x, y = self:getSideBtnPos(rightNum, offsetY, true)
end
return offsetY, rightNum, x, y
end
function MainComp:updateTime()
self:refreshPopUI()
self:refreshRedPoint()
end
function MainComp:refreshPopUI()
if self.popData and #self.popData > 0 then
local data = self.popData[1]
local nowTime = Time:getServerTime()
local endTime = data.endTime or 0
if nowTime > endTime then
self.popData = DataManager.ActivityGiftData:getPopGiftData()
self.popGiftCd:setText("")
return
end
self.popGiftCd:setText(GFunc.getTimeStrWithHMS(endTime - nowTime))
end
end
--region 红点
function MainComp:refreshRedPoint()
-- self.boxRedPoint = self:chapterBoxRedPoint()
-- -- 两侧按钮
-- self.showLeftRed = self:showLeftRedPoint()
-- self.showRightRed = self:showRightRedPoint()
end
function MainComp:getIsShowRedPoint()
return self.boxRedPoint or self.showLeftRed or self.showRightRed
end
function MainComp:showLeftRedPoint()
local sevenDayRed = self:showSevenDayRedPoint()
local rechargeRed = self:refreshFirstRechargeRedPoint()
return sevenDayRed or rechargeRed
end
function MainComp:showRightRedPoint()
local lvGiftRedPoint = self:refreshLvGiftRedPoint()
local taskRedPoint = self:refreshTaskRedPoint()
return lvGiftRedPoint or taskRedPoint
end
function MainComp:showSevenDayRedPoint()
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_SEVENDAY, true) then
return false
end
return DataManager.SevenDayData:getRedPoint()
end
function MainComp:chapterBoxRedPoint()
-- local showRedPoint = DataManager.StageData:showMainCompRedPoint()
-- if showRedPoint then
-- self.boxImg:addRedPoint(58, 46, 0.8)
-- GFunc.getShakeSeqRotate(self.boxShakeImg,nil, true)
-- else
-- self.boxImg:removeRedPoint()
-- GFunc.getShakeSeqRotate(self.boxShakeImg,true)
-- end
-- return showRedPoint
end
function MainComp:refreshLvGiftRedPoint()
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_LEVEL_GIFT, true) then
return false
end
local giftHallNeedRp = false
if DataManager.ActivityGiftData:showLvGiftRedPoint() then
self.lvGiftBtn:addRedPoint(30, 30, 0.6)
giftHallNeedRp = true
else
self.lvGiftBtn:removeRedPoint()
end
return giftHallNeedRp
end
function MainComp:refreshFirstRechargeRedPoint()
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.FIRST_CHARGE, true) then
return false
end
if DataManager.ActivityGiftData:canClaimFirstGift() then
self.firstRechargeBtn:addRedPoint(30, 30, 0.6)
return true
else
self.firstRechargeBtn:removeRedPoint()
end
end
function MainComp:refreshTaskRedPoint()
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.TASK, true) then
return false
end
if DataManager.TaskData:showRedPoint() then
self.taskBtn:addRedPoint(30, 30, 0.6)
return true
else
self.taskBtn:removeRedPoint()
end
return false
end
--endregion
return MainComp

Some files were not shown because too many files have changed in this diff Show More