encoding upate

dev_chengFeng
jiaoyangna 2020-08-06 17:52:32 +08:00
parent 41cf013543
commit e0359bb37a
662 changed files with 660 additions and 662 deletions

View File

@ -1,4 +1,4 @@
Language = {
Language = {
[10001] = "没有ActivityTypeDef为%s任务Id为%s的数据",
[10002] = "没有ActivityTypeDef为%s任务",
[10003] = "活动关闭 ",

View File

@ -1,4 +1,4 @@
-- Lua中的继承
-- Lua中的继承
function Inherit(tbParent, tbChild)
if not tbParent then
local o = tbChild or {}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
AchievementPanel = Inherit(BasePanel)
local this = AchievementPanel
local redPointGrid = {}--红点

View File

@ -1,4 +1,4 @@
ActivityGiftManager = {};
ActivityGiftManager = {};
local this = ActivityGiftManager
local ActivityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
CourtesyDressPanel = Inherit(BasePanel)
local this = CourtesyDressPanel
local chapterList = { Language[10005], Language[10006], Language[10007], Language[10008], Language[10009], Language[10010], Language[10011], Language[10012], Language[10013], Language[10014], Language[10015], Language[10016], Language[10017], Language[10018], Language[10019] }

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
OpenSeverWelfarePanel = Inherit(BasePanel)
local this = OpenSeverWelfarePanel
local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)

View File

@ -1,4 +1,4 @@
local SevenDayGift = quick_class("SevenDayGift")
local SevenDayGift = quick_class("SevenDayGift")
local this = SevenDayGift
local selectIndex = 0
local jumpNeedBtn = 0

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
WarPowerSortPanel = Inherit(BasePanel)
local activityRewardGrid = {}
local activityRewardGridItemView = {}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local AdventureAlianInvasionPanel = Inherit(BasePanel)
local this = AdventureAlianInvasionPanel
-- Tab管理器

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
AdventureExploreRewardPanel = Inherit(BasePanel)
local this=AdventureExploreRewardPanel
local baseDrop={}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local AdventureGetRewardPopup = Inherit(BasePanel)
local this = AdventureGetRewardPopup

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
require("Modules/Adventure/View/AdventureView")
local AdventureMainPanel = Inherit(BasePanel)
local this = AdventureMainPanel

View File

@ -1,4 +1,4 @@
AdventureManager = {}
AdventureManager = {}
local this = AdventureManager
local GameSetting = ConfigManager.GetConfig(ConfigName.GameSetting)
local AdventureReward = ConfigManager.GetConfig(ConfigName.AdventureReward)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local AdventureRewardDetailPopup = Inherit(BasePanel)
local this = AdventureRewardDetailPopup

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
AdventureUpLevelPanel = Inherit(BasePanel)
local this = AdventureUpLevelPanel
local RewardGroup = ConfigManager.GetConfig(ConfigName.RewardGroup)

View File

@ -1,4 +1,4 @@
AdventureView = {}
AdventureView = {}
require("Base/BasePanel")
local MonsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup)
local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local AlienMainPanel = Inherit(BasePanel)
local this = AlienMainPanel
--初始化组件(用于子类重写)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local AlienRankRewardPopup = Inherit(BasePanel)
local this = AlienRankRewardPopup
--初始化组件(用于子类重写)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local ArenaMainPanel = Inherit(BasePanel)
local this = ArenaMainPanel

View File

@ -1,4 +1,4 @@
ArenaManager = {};
ArenaManager = {};
local this = ArenaManager
local ArenaReward = ConfigManager.GetConfig(ConfigName.ArenaReward)
local ArenaSetting = ConfigManager.GetConfig(ConfigName.ArenaSetting)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local ArenaRecordPopup = Inherit(BasePanel)
local this = ArenaRecordPopup

View File

@ -1,4 +1,4 @@

require("Base/BasePanel")
local ArenaResultPopup = Inherit(BasePanel)
local this = ArenaResultPopup

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local ArenaTypePanel = Inherit(BasePanel)
local this = ArenaTypePanel

View File

@ -1,4 +1,4 @@
local ArenaView = {}
local ArenaView = {}
local this = ArenaView
local rewardBoxBtn = {}
local arenaBattleReward = ConfigManager.GetConfig(ConfigName.ArenaBattleReward)

View File

@ -1,4 +1,4 @@
local RankView = {}
local RankView = {}
local this = RankView
-- 头像对象管理

View File

@ -1,4 +1,4 @@
RewardView = {}
RewardView = {}
local goList={}
local viewList={}
local DAILYREWARD=1

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local ATMMyGuessHistoryPopup = Inherit(BasePanel)
local this = ATMMyGuessHistoryPopup
local _PlayerHeadList = {}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local ATMTeamRankPopup = Inherit(BasePanel)
local this = ATMTeamRankPopup
local _PlayerHeadList = {}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
ArenaTopMatchGuessTipViewPopup = Inherit(BasePanel)
local this = ArenaTopMatchGuessTipViewPopup
local betBattleInfo = nil

View File

@ -1,4 +1,4 @@
ArenaTopMatchManager = {};
ArenaTopMatchManager = {};
local this = ArenaTopMatchManager
this.CurTabIndex = 0
this.curIsShowDoGuessPopup = false

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local ArenaTopMatchPanel = Inherit(BasePanel)
local this = ArenaTopMatchPanel

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local DoGuessPopup = Inherit(BasePanel)
local this = DoGuessPopup
local GUESS_COIN = ArenaTopMatchManager.GetGuessCoinID()

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local GuessCoinDropPopup = Inherit(BasePanel)
local this = GuessCoinDropPopup
--初始化组件(用于子类重写)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
RecordPopup = Inherit(BasePanel)
local this = RecordPopup
local _PlayerHeadList = {}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
TopMatchPlayBattleAinSelectPopup = Inherit(BasePanel)
local this = TopMatchPlayBattleAinSelectPopup
local resultRes = {

View File

@ -1,4 +1,4 @@
---
---
--- Generated by EmmyLua(https://github.com/EmmyLua)
--- Created by Steven Hawking.
--- DateTime: 9/11/21 17:04

View File

@ -1,4 +1,4 @@
local ATM_EliminationView={}
local ATM_EliminationView={}
local this=ATM_EliminationView
-- Tab管理器
local ArenaTopMatchPanel= require("Modules/ArenaTopMatch/ArenaTopMatchPanel")

View File

@ -1,4 +1,4 @@
--竞猜提示面板
--竞猜提示面板
local ATM_GuessTipView = {}
local this = ATM_GuessTipView
local betBattleInfo = nil

View File

@ -1,4 +1,4 @@
local ATM_GuessView={}
local ATM_GuessView={}
local this=ATM_GuessView
local commonInfo = require("Modules/ArenaTopMatch/View/ATM_CommonInfo")
local matchPanel=require("Modules/ArenaTopMatch/ArenaTopMatchPanel")

View File

@ -1,4 +1,4 @@
local ATM_MainMatchView={}
local ATM_MainMatchView={}
local this=ATM_MainMatchView
local commonInfo = require("Modules/ArenaTopMatch/View/ATM_CommonInfo")
--初始化组件(用于子类重写)

View File

@ -1,4 +1,4 @@
local ATM_RankView={}
local ATM_RankView={}
local this=ATM_RankView
--头名
-- local TitleName={

View File

@ -1,4 +1,4 @@
local ATM_RewardView = {}
local ATM_RewardView = {}
local this = ATM_RewardView
---巅峰战奖励

View File

@ -1,4 +1,4 @@
local ATM_Title={}
local ATM_Title={}
local this = ATM_Title
--初始化组件(用于子类重写)

View File

@ -1,4 +1,4 @@
BagManager = {}
BagManager = {}
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local equipConfig = ConfigManager.GetConfig(ConfigName.EquipConfig)
local equipSign = ConfigManager.GetConfig(ConfigName.EquipSign)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
BagPanel = Inherit(BasePanel)
local this = BagPanel
local sortIndex = 0

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
BagResolveAnCompoundPanel = Inherit(BasePanel)
local this=BagResolveAnCompoundPanel
--分解

View File

@ -1,4 +1,4 @@
BattleManager = {}
BattleManager = {}
local this = BattleManager
local PassiveSkillLogicConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig)
local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig)

View File

@ -1,4 +1,4 @@
require("Base/Stack")
require("Base/Stack")
BATTLE_POOL_TYPE = {
MY_ROLE = 0,

View File

@ -1,4 +1,4 @@
BattleRecordManager = {}
BattleRecordManager = {}
local this = BattleRecordManager
local BattleRecordList = {}

View File

@ -1,4 +1,4 @@
local FightEffectAudioConfig = {}
local FightEffectAudioConfig = {}
local this = FightEffectAudioConfig
function FightEffectAudioConfig.Init()

View File

@ -1,4 +1,4 @@

local Files = {
"Modules.Battle.BattlePool",
"Modules.Battle.View.RoleView",

View File

@ -1,4 +1,4 @@
PokemonEffectConfig = {
PokemonEffectConfig = {
[1] = {
live = "live2d_s_jieling_dlg_3010",
scale = 0.6,

View File

@ -1,4 +1,4 @@
BattleEvent={}
BattleEvent={}
BattleEvent.__index = BattleEvent
local listPool = BattleObjectPool.New(function ()

View File

@ -1,4 +1,4 @@
Buff = {}
Buff = {}
local floor = math.floor
local buffPoolList = {}

View File

@ -1,4 +1,4 @@
local floor = math.floor
local floor = math.floor
local min = math.min
local max = math.max
--local RoleDataName = RoleDataName

View File

@ -1,4 +1,4 @@
local floor = math.floor
local floor = math.floor
local max = math.max
local min = math.min
--local RoleDataName = RoleDataName

View File

@ -1,4 +1,4 @@
Random = {}
Random = {}
local floor = math.floor
local seed = 0

View File

@ -1,4 +1,4 @@
RoleData = {}
RoleData = {}
RoleData.__index = RoleData
local max = math.max
local floor = math.floor

View File

@ -1,4 +1,4 @@
local effect = require("Modules/Battle/Logic/Base/Effect")
local effect = require("Modules/Battle/Logic/Base/Effect")
local floor = math.floor
local max = math.max
local min = math.min

View File

@ -1,4 +1,4 @@
BattleLogManager = {}
BattleLogManager = {}
local this = BattleLogManager
local isLog = false

View File

@ -1,4 +1,4 @@
BattleLogic = {}
BattleLogic = {}
local floor = math.floor
local min = math.min

View File

@ -1,4 +1,4 @@
Aura = Buff:New()
Aura = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function Aura:SetData(...)

View File

@ -1,4 +1,4 @@
Brand = Buff:New()
Brand = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function Brand:SetData(...)

View File

@ -1,4 +1,4 @@
Control = Buff:New()
Control = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function Control:SetData(...)

View File

@ -1,4 +1,4 @@
Curse = Buff:New()
Curse = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值

View File

@ -1,4 +1,4 @@
DOT = Buff:New()
DOT = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function DOT:SetData(...)

View File

@ -1,4 +1,4 @@
HOT = Buff:New()
HOT = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function HOT:SetData(...)

View File

@ -1,4 +1,4 @@
-- 免疫效果
-- 免疫效果
Immune = Buff:New()
local immune0 = function(buff)

View File

@ -1,4 +1,4 @@
NoDead = Buff:New()
NoDead = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function NoDead:SetData(...)

View File

@ -1,4 +1,4 @@
PropertyChange = Buff:New()
PropertyChange = Buff:New()
--初始化Buff通过传入一些自定义参数控制成长相关的数值
function PropertyChange:SetData(...)

View File

@ -1,4 +1,4 @@
Shield = Buff:New()
Shield = Buff:New()
-- 无敌吸血盾的免疫状态
local immune0 = function(buff)
return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT

View File

@ -1,4 +1,4 @@
local index = 0
local index = 0
local function indexAdd()
index = index + 1
return index

View File

@ -1,4 +1,4 @@
BattleDictionary = {}
BattleDictionary = {}
function BattleDictionary.New()
local o = {}
setmetatable(o, BattleDictionary)

View File

@ -1,4 +1,4 @@
BattleList = {}
BattleList = {}
function BattleList.New()
local o = {}
setmetatable(o, BattleList)

View File

@ -1,4 +1,4 @@
BattleObjectPool = {}
BattleObjectPool = {}
function BattleObjectPool.New(onCreate)
local o = {}
setmetatable(o, BattleObjectPool)

View File

@ -1,4 +1,4 @@
BattleQueue = {}
BattleQueue = {}
function BattleQueue.New()
local o = {}
setmetatable(o, BattleQueue)

View File

@ -1,4 +1,4 @@
BattleUtil = {}
BattleUtil = {}
--local BattleUtil = BattleUtil
local floor = math.floor
local max = math.max

View File

@ -1,4 +1,4 @@
--战斗外数据管理、
--战斗外数据管理、
OutDataManager = {}
local this = OutDataManager

View File

@ -1,4 +1,4 @@
RoleLogic = {}
RoleLogic = {}
RoleLogic.__index = RoleLogic
--local RoleLogic = RoleLogic
--local RoleDataName = RoleDataName

View File

@ -1,4 +1,4 @@
RoleManager = {}
RoleManager = {}
local this = RoleManager
-- 将死之人

View File

@ -1,4 +1,4 @@
SkillManager = {}
SkillManager = {}
local this = SkillManager
local skillPool = BattleObjectPool.New(function ()

View File

@ -1,4 +1,4 @@

RoleSetView = {}
local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig)
-- 初始化角色设置界面

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
require("Base/Stack")
require("Modules.Battle.Config.PokemonEffectConfig")
require("Modules/Battle/Test/BattleSetView")

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local BattleBestPopup = Inherit(BasePanel)
local this = BattleBestPopup
local func2 = nil--此回调目前只有大闹天宫试炼节点用 当有没有事件时 关闭按钮不好使

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
BattleEndPanel = Inherit(BasePanel)
local this = BattleEndPanel
local BattlePanel

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
require("Base/Stack")
require("Modules.Battle.Config.PokemonEffectConfig")
local BattleView = require("Modules/Battle/View/BattleView")

View File

@ -1,4 +1,4 @@
local RoleShowView = {}
local RoleShowView = {}
local this = RoleShowView
-- local liveNodes={}--立绘容器

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
local BattleStageTipPopup = Inherit(BasePanel)
local this = BattleStageTipPopup

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
require("Modules.Battle.Config.PokemonEffectConfig")
local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig")
-- local RoleShowView = require("Modules/Battle/View/BattleRoleShowView")

View File

@ -1,4 +1,4 @@
BuffView ={}
BuffView ={}
BuffView.__index = BuffView
function BuffView.New(go, buff, icon)

View File

@ -1,4 +1,4 @@
require("Modules.Battle.Config.PokemonEffectConfig")
require("Modules.Battle.Config.PokemonEffectConfig")
require("Base/BasePanel")
local DamageResultPanel = Inherit(BasePanel)
local this = DamageResultPanel

View File

@ -1,4 +1,4 @@
require("Modules.Battle.Logic.Misc.BattleDefine")
require("Modules.Battle.Logic.Misc.BattleDefine")
local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig")
RoleView = {}
RoleView.__index = RoleView

View File

@ -1,4 +1,4 @@
--[[
--[[
* @ClassName BindPhoneNumberManager
* @Description
* @Date 2019/9/2 9:39

View File

@ -1,4 +1,4 @@
--[[
--[[
* @ClassName ConfirmBindPanel
* @Description
* @Date 2019/8/30 16:17

View File

@ -1,4 +1,4 @@
-- 管理副本的一些通用数据
-- 管理副本的一些通用数据
-- 副本ID就是地图Id
CarbonManager = {};
local this = CarbonManager

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
CarbonMopUpEndPanel = Inherit(BasePanel)
local this=CarbonMopUpEndPanel
local challengeConfig = ConfigManager.GetConfig(ConfigName.ChallengeConfig)

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
CarbonScoreSortPanel = Inherit(BasePanel)
local this=CarbonScoreSortPanel
local mapRankInfo={}

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
CarbonTypePanel = Inherit(BasePanel)
local this = CarbonTypePanel
local hasFresh = false

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
CarbonTypePanelV2 = Inherit(BasePanel)
local this = CarbonTypePanelV2
local hasFresh = false

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")
require("Base/BasePanel")
CarbonTypePanelV3 = Inherit(BasePanel)
local this = CarbonTypePanelV3
local hasFresh = false

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