Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
64d1f4883e
|
@ -13,9 +13,10 @@ public class AutoPack : EditorWindow
|
|||
new string[]{ "C轮v2", "Logo_gm_nosdk", "TCX_TEST_C_V2", "china/zf_test"},
|
||||
new string[]{ "灵动专服-测试", "Logo_gn_zf_test", "MHT_GN_ZF_TEST" , "china/zf_test"},
|
||||
new string[]{ "灵动专服-正式", "Logo_gn_zf_release", "MHT_GN_ZF_RELEASE" , "china/zf_test"},
|
||||
new string[]{ "灵动专服-Quick", "Logo_gn_zf_quick", "MHT_GN_ZF_QUICK", "china/zf_test"},
|
||||
new string[]{ "喜扑", "Logo_cn_xipu", "MHT_CN_XIPU", "china/zf_test"},
|
||||
new string[]{ "草花", "Logo_cn_caohua", "MHT_CN_MIDDLE_WARE" , "china/zf_test"},
|
||||
new string[]{ "Quick", "Logo_cn_quick", "MHT_CN_QUICK" , "china/local"},
|
||||
new string[]{ "Quick", "Logo_cn_quick", "MHT_CN_QUICK" , "china/zf_test"},
|
||||
|
||||
// 灵动商务
|
||||
new string[]{ "灵动商务", "Logo_mht_sw", "MHT_GN_SW" , "china/mht_sw"},
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
BattleManager = {}
|
||||
BattleManager = {}
|
||||
local this = BattleManager
|
||||
local PassiveSkillLogicConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig)
|
||||
local SkillLogicConfig = ConfigManager.GetConfig(ConfigName.SkillLogicConfig)
|
||||
|
@ -1010,10 +1010,10 @@ end
|
|||
--++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
-- 通过接口获取战斗数据
|
||||
function this.RequestBattleDataByFightId(fightId, func)
|
||||
function this.RequestBattleDataByFightId(serverUrl, fightId, func)
|
||||
local uid = string.split(fightId, "_")[1]
|
||||
local requestUrl = string.format("http://119.28.114.198:8888/req/getFightRecord?uid=%s&fightid=%s", uid, fightId)
|
||||
--LogGreen(requestUrl)
|
||||
local requestUrl = string.format("http://%s/req/getFightRecord?uid=%s&fightid=%s", serverUrl, uid, fightId)
|
||||
LogGreen(requestUrl)
|
||||
networkMgr:SendGetHttp(requestUrl, function(str)
|
||||
--LogGreen(str)
|
||||
local json = require 'cjson'
|
||||
|
|
|
@ -356,7 +356,11 @@ end
|
|||
function this:SetGongMingList(Id)
|
||||
local data = HeroManager.GetSingleHeroData(Id)
|
||||
table.insert(this.hongmengGongMingList,data)
|
||||
|
||||
-- LogYellow("Id "..Id)
|
||||
if not ExpeditionManager.heroInfo[Id] then
|
||||
-- LogRed("Id "..Id)
|
||||
ExpeditionManager.InitHeroHpValue(Id)
|
||||
end
|
||||
end
|
||||
|
||||
function this:RemoveGongMingList(Id)
|
||||
|
|
|
@ -101,7 +101,7 @@ function GMPanel:InitComponent()
|
|||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "挑战怪物", inputTip = {"输入怪物组id"}, callBack = this.ChallengeMonster},
|
||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "测试假战斗", inputTip = {"输入假战斗id"}, callBack = this.RunFakeBattle},
|
||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "演算战斗数据", inputTip = {"战斗数据", "时间戳"}, callBack = this.RunBattleData},
|
||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = "演算后端战斗", inputTip = {"输入战斗id"}, callBack = this.RunServerBattle},
|
||||
{type = GMType.Battle, subType = GMSubType.Func, inputNum = 2, args = "", btnTip = "演算后端战斗", inputTip = {"GM格式:IP地址:端口", "输入战斗id"}, callBack = this.RunServerBattle},
|
||||
}
|
||||
|
||||
this.BtnBack = Util.GetGameObject(self.transform, "btnBack")
|
||||
|
@ -382,8 +382,8 @@ function this.RunFakeBattle(fakeId)
|
|||
end
|
||||
|
||||
-- 请求服务器战斗数据
|
||||
function this.RunServerBattle(fightId)
|
||||
BattleManager.RequestBattleDataByFightId(fightId, function(fightData)
|
||||
function this.RunServerBattle(serverUrl, fightId)
|
||||
BattleManager.RequestBattleDataByFightId(serverUrl, fightId, function(fightData)
|
||||
--LogGreen("战斗回调")
|
||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.Test)
|
||||
end)
|
||||
|
|
|
@ -368,8 +368,10 @@ namespace GameEditor.FrameTool
|
|||
|
||||
new string[]{ "灵动-专服-测试", "mht_china/zf", "cdn_mht_zf_test", "china/zf_test" },
|
||||
new string[]{ "灵动-专服", "mht_china/zf", "cdn_mht_zf_release", "china/zf_test" },
|
||||
new string[]{ "灵动-Quick", "mht_china/zf", "cdn_mht_zf_quick", "china/zf_test" },
|
||||
new string[]{ "草花", "mht_china/zf", "cdn_caohua", "china/zf_test" },
|
||||
new string[]{ "喜扑", "mht_china/zf", "cdn_xipu", "china/zf_test" },
|
||||
new string[]{ "Quick", "mht_china/zf", "cdn_quick", "china/zf_test" },
|
||||
|
||||
new string[]{ "先遣-内网", "mht_china/local", "local12_cn_local", "china/local" },
|
||||
new string[]{ "先遣-测试", "mht_china/xq", "cdn_xq_test", "china/test" },
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
{"subChannel":"2000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_quick/","packageVersion":"0.1","version":"1.1.12","serverUrl":"http://139.159.155.66:8080/"}
|
Loading…
Reference in New Issue