Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-11-22 15:03:03 +08:00
commit 8bb17fa29c
2 changed files with 43 additions and 13 deletions

View File

@ -78,7 +78,7 @@ local this = GMPanel
"1#60198#6","1#60199#6","1#60201#6","1#60161#6","1#60162#6","1#60163#6","1#60164#6","1#60165#6","1#60166#6","1#60186#6","1#60187#6","1#60188#6","1#60189#6", "1#60198#6","1#60199#6","1#60201#6","1#60161#6","1#60162#6","1#60163#6","1#60164#6","1#60165#6","1#60166#6","1#60186#6","1#60187#6","1#60188#6","1#60189#6",
"1#60178#6","1#60179#6","1#60202#6","1#60203#6","1#60204#6","1#60205#6","1#60206#6","1#60207#6","1#60208#6","1#60209#6","1#60210#6","1#60211#6","1#60212#6","1#60213#6", "1#60178#6","1#60179#6","1#60202#6","1#60203#6","1#60204#6","1#60205#6","1#60206#6","1#60207#6","1#60208#6","1#60209#6","1#60210#6","1#60211#6","1#60212#6","1#60213#6",
} }
local moneyList = {"1#74#999", "1#87#999", "1#1226#99999999", "1#5000050#99", "1#20007#10", "1#1203#10000", "1#14#500000000","1#16#400000000", "1#3#500000000", "1#4#9999999", "1#20#999999",} local moneyList = {"1#14#2000000000","1#16#2000000000","1#74#99999", "1#87#99999", "1#1226#99999999", "1#5000050#99", "1#20007#10", "1#1203#10000", "1#3#500000000", "1#4#9999999", "1#20#999999",}
--初始化组件(用于子类重写) --初始化组件(用于子类重写)
function GMPanel:InitComponent() function GMPanel:InitComponent()
this.spLoader = SpriteLoader.New() this.spLoader = SpriteLoader.New()
@ -111,6 +111,8 @@ function GMPanel:InitComponent()
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成所有装备", inputTip = {""}, callBack = this.GetEquipe}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成所有装备", inputTip = {""}, callBack = this.GetEquipe},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "鑫鹏的gm", inputTip = {""}, callBack = this.SendToXinPeng}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "鑫鹏的gm", inputTip = {""}, callBack = this.SendToXinPeng},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键法宝碎片", inputTip = {""}, callBack = this.GetFaBaoSuiPian},
{type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键变身卡", inputTip = {""}, callBack = this.GetBianshenka},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil},
{type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "15#%s#0", btnTip = "获取", inputTip = {"孙龙秘宝积分"}, callBack = this.SetSunLongScroe},
@ -354,9 +356,37 @@ function this.GetMoney()
local time = Timer.New(function () local time = Timer.New(function ()
NetManager.GMEvent(moneyList[index]) NetManager.GMEvent(moneyList[index])
index = index + 1 index = index + 1
end, 1, 10, true) end, 0.5, 10, true)
time:Start() time:Start()
end end
-- 一键法宝碎片
function this.GetFaBaoSuiPian()
local ic = ConfigManager.GetConfig(ConfigName.ItemConfig)
local i = 0
coroutine.start(function()
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ItemConfig)) do
if ItemType.talismanSoulChip == configInfo.ItemType then
NetManager.GMEvent("1#"..configInfo.Id.."#1000")
coroutine.wait(0.01)
end
end
end)
end
-- 一键变身卡
function this.GetBianshenka()
local ic = ConfigManager.GetConfig(ConfigName.ItemConfig)
local i = 0
coroutine.start(function()
for _, configInfo in ConfigPairs(ConfigManager.GetConfig(ConfigName.ItemConfig)) do
if ItemType.Incarnation == configInfo.ItemType then
NetManager.GMEvent("1#"..configInfo.Id.."#1")
coroutine.wait(0.01)
end
end
end)
end
-- 测试跳转 -- 测试跳转
function this.TestJump(text) function this.TestJump(text)
JumpManager.GoJump(tonumber(text)) JumpManager.GoJump(tonumber(text))

View File

@ -15,22 +15,22 @@ public class RoleProperty : MonoBehaviour
"速度", "速度",
"伤害加成系数(%", "伤害加成系数(%",
"伤害减免系数(%", "伤害减免系数(%",
"施法率%", "命中lv%",
"后期基础施法率(%", "闪避率(%",
"暴击率(%", "暴击率(%",
"暴击伤害系数(%", "暴击伤害系数(%",
"抗暴率(%", "抗暴率(%",
"治疗加成系数(%", "治疗加成系数(%",
"受到治疗加成系数(%", "受到治疗加成系数(%",
"队伍伤害加成系数%", "人系伤害加成%",
"队伍伤害减免系数%", "佛系伤害加成%",
"火系伤害减免系数%", "妖系伤害加成%",
"风系伤害减免系数%", "道系伤害加成%",
"冰系伤害减免系数%", "人系伤害减免%",
"地系伤害减免系数%", "佛系伤害减免%",
"光系伤害减免系数%", "妖系伤害减免%",
"暗系伤害减免系数%", "道系伤害减免%",
"属性伤害加成系数%", "暴击伤害减免%",
"初始怒气值", "初始怒气值",
}; };
private Dictionary<string, float> _dic = new Dictionary<string, float>(); private Dictionary<string, float> _dic = new Dictionary<string, float>();