From 57060f5bee4bcdd2c32d277d124625a95a775d7b Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 28 Jun 2021 11:27:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E3=80=91=E4=B8=80=E9=94=AE=E4=B8=8A=E9=98=B5=E6=8A=A5?= =?UTF-8?q?=E9=94=992?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Harmony/Manager/HarmonyManager.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 2f9924de06..c2bd3642cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -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) From e46c1eb833db8c37d79d1a34dc3efdb66e690886 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 28 Jun 2021 11:50:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90GM=E3=80=91=E6=BC=94=E7=AE=97?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=88=98=E6=96=97=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0GM=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/BattleManager.lua | 8 ++++---- Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index b54a3c9d7f..410c7a30e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -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' diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 25c18f7275..747d104f5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -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) From 318323e50d0bed38d0c3514d7092138ee7fd2a28 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 28 Jun 2021 14:12:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E9=85=8D=E7=BD=AE=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A1=AC=E6=A0=B8=E6=B8=A0=E9=81=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 3 ++- Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index e87a46150f..ee80967842 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -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_CN_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"}, diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index 76028183e4..d7c54dfedd 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -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" }, From 1c4e8b184db12b4f75a867f5a88823bb249c45d7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 28 Jun 2021 15:31:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E7=8C=95=E7=8C=B4=E6=A1=83?= =?UTF-8?q?=E4=B8=93=E6=9C=8Dquick=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version/国内-专服-quick.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Version/国内-专服-quick.txt diff --git a/Version/国内-专服-quick.txt b/Version/国内-专服-quick.txt new file mode 100644 index 0000000000..639fa6ec71 --- /dev/null +++ b/Version/国内-专服-quick.txt @@ -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/"} \ No newline at end of file From c94eba491aff89b5986d895b5fa204d83000d8db Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 28 Jun 2021 15:53:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E9=85=8D=E7=BD=AE=E3=80=91?= =?UTF-8?q?=E7=8C=95=E7=8C=B4=E6=A1=83=E7=A1=AC=E6=A0=B8=E4=B8=93=E6=9C=8D?= =?UTF-8?q?=E6=AF=8D=E5=8C=85=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index ee80967842..918f3f9bfc 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -13,7 +13,7 @@ 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_CN_QUICK" , "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/zf_test"},