From bbfcdf16e6a94a98c14681a195c71b3ef77ed8d1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 7 Jun 2021 13:32:01 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E3=80=90=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E3=80=91=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6c31fa860d5e3872bd6d5950740e31a7201136af) --- .../ManagedResources/~Lua/Modules/Main/MainPanel.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index f281b9ea10..6c0cfa217c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -755,10 +755,10 @@ function this.CreatActivity() else activityTabs[k].timeImg.gameObject:SetActive(true) end - if v.RpType > 0 then - --绑定新的红点 - BindRedPointObject(v.RpType,activityTabs[k].redpot) - end + -- if v.RpType > 0 then + -- --绑定新的红点 + -- BindRedPointObject(v.RpType,activityTabs[k].redpot) + -- end if v.ActiveType > 0 then local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then @@ -1406,6 +1406,10 @@ function this.RefreshActivityShow() for k,v in ipairs(activitys) do local ishow = DynamicActivityManager.IsQualifiled(v.Id) if ishow then + if v.RpType > 0 then + --绑定新的红点 + BindRedPointObject(v.RpType,activityTabs[k].redpot) + end if v.ActiveType < 1 and v.FunType < 1 then if v.ActId == 666 then --限时折扣 From 1cfcd3346c3a12901803396edacd0932cadd90c2 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 7 Jun 2021 13:45:48 +0800 Subject: [PATCH 02/17] =?UTF-8?q?Revert=20"=E3=80=90=E5=8F=B3=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E6=B4=BB=E5=8A=A8=E3=80=91=E7=BA=A2=E7=82=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bbfcdf16e6a94a98c14681a195c71b3ef77ed8d1. --- .../ManagedResources/~Lua/Modules/Main/MainPanel.lua | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 6c0cfa217c..f281b9ea10 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -755,10 +755,10 @@ function this.CreatActivity() else activityTabs[k].timeImg.gameObject:SetActive(true) end - -- if v.RpType > 0 then - -- --绑定新的红点 - -- BindRedPointObject(v.RpType,activityTabs[k].redpot) - -- end + if v.RpType > 0 then + --绑定新的红点 + BindRedPointObject(v.RpType,activityTabs[k].redpot) + end if v.ActiveType > 0 then local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then @@ -1406,10 +1406,6 @@ function this.RefreshActivityShow() for k,v in ipairs(activitys) do local ishow = DynamicActivityManager.IsQualifiled(v.Id) if ishow then - if v.RpType > 0 then - --绑定新的红点 - BindRedPointObject(v.RpType,activityTabs[k].redpot) - end if v.ActiveType < 1 and v.FunType < 1 then if v.ActId == 666 then --限时折扣 From 22fc263d5b7dc8b02d5a01486aa4e91730a91149 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 7 Jun 2021 21:28:45 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=95=88=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=A7=B0=E5=8F=B7=E7=89=B9=E6=95=88?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat index 61a0dc870a..201b358a43 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat +++ b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat @@ -7,8 +7,8 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: chenghao_mat4 - m_Shader: {fileID: 4800000, guid: 3e68b57b20d35ac41a6cb8f16e0f5f11, type: 3} + m_Name: chenghao_mat5 + m_Shader: {fileID: 4800000, guid: 3a656dd7e5079514386bd3210f3414ce, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 From 638b6e6d3b1e17a99457eeb214e25d9aefc4dd95 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 8 Jun 2021 11:04:11 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=B0=E5=8F=B7=E5=9C=A8=E8=80=81=E5=8C=85?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PublicArtRes/Materials/chenghao_mat5.mat | 3 +++ .../ManagedResources/~Lua/View/PlayerTitle.lua | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat index 201b358a43..3815a9dfa3 100644 --- a/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat +++ b/Assets/ManagedResources/PublicArtRes/Materials/chenghao_mat5.mat @@ -84,14 +84,17 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Rotator: 0 - _Rotator_copy: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _U: 0.2 - _UVSec: 0 + - _U_Speed: 0.1 - _U_Speed_copy: -0.5 - _V: 0.7 + - _V_Speed: 0.1 - _V_Speed_copy: -0.5 - _ZWrite: 1 m_Colors: diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua index 1df9f52e2b..b7de9207ae 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -83,9 +83,19 @@ function PlayerTitle:SetScale(scale) end function PlayerTitle:SetEffectScale(effectScale) - if isScaleActive then - if self.titleLive then - Util.SetParticleScale(self.titleLive, effectScale) + if self.titleLive then + Util.SetParticleScale(self.titleLive, effectScale) + -- 老包称号显示优化 + if not isScaleActive then + local particles = self.titleLive:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + local isScale = false + for key, value in pairs(particles:ToTable()) do + value.transform.localScale = value.transform.localScale / effectScale + isScale = true + end + if isScale then + self.titleLive.transform.localScale = self.titleLive.transform.localScale / effectScale + end end end end From edd8c055cb3266663e59f6c8573cee171322e3e6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 8 Jun 2021 14:06:12 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=8D=E4=BC=98=E5=8C=96=EF=BC=8C=E8=80=81?= =?UTF-8?q?=E5=8C=85=E4=B9=9F=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scripts/Utility/Util.cs | 4 ++-- Assets/ManagedResources/~Lua/View/PlayerLiveView.lua | 2 +- Assets/ManagedResources/~Lua/View/PlayerTitle.lua | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/LuaFramework/Scripts/Utility/Util.cs b/Assets/LuaFramework/Scripts/Utility/Util.cs index 9cbb1839ca..788e17df68 100644 --- a/Assets/LuaFramework/Scripts/Utility/Util.cs +++ b/Assets/LuaFramework/Scripts/Utility/Util.cs @@ -901,11 +901,11 @@ namespace GameLogic main.startRotationMultiplier *= scale; } main.startSpeedMultiplier *= scale; - //particle.transform.localScale *= scale; + particle.transform.localScale *= scale; } if (hasParticleObj) { - //go.transform.localScale = new Vector3(scale, scale, scale); + go.transform.localScale = new Vector3(scale, scale, scale); } } diff --git a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua index ccafc64e95..7536ed8698 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerLiveView.lua @@ -180,7 +180,7 @@ function PlayerLiveView:OnShowLive() else effect=self.leader.transform.localScale.x end - self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale*effect,self.orginLayer) + self.titleLive:SetShow(self.PlayerLiveViewData.designation, curLocalPosition, curArtResourcesConfig.Scale, curArtResourcesConfig.Scale * effect,self.orginLayer) end end function PlayerLiveView:SetNameHeight(hei) diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua index b7de9207ae..70f79af34d 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -58,12 +58,12 @@ function PlayerTitle:SetShow(itemId, position, scale, effectScale, layer) if position then self:SetPostion(position) end - if scale then - self:SetScale(scale) - end if effectScale then self:SetEffectScale(effectScale) end + if scale then + self:SetScale(scale) + end if layer then self:SetLayer(layer) end @@ -77,6 +77,7 @@ end function PlayerTitle:SetScale(scale) + self.scale = scale if self.titleLive then self.titleLive.transform.localScale = Vector3.one * scale end @@ -94,7 +95,7 @@ function PlayerTitle:SetEffectScale(effectScale) isScale = true end if isScale then - self.titleLive.transform.localScale = self.titleLive.transform.localScale / effectScale + self.titleLive.transform.localScale = Vector3.one * (self.scale or 1) end end end From 8df928f68693818e984c9019d20d6e1713155411 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 8 Jun 2021 11:40:40 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E3=80=90ID1016261=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E7=81=B5=E5=85=BD=E5=AE=9D=E9=98=81=E3=80=91=E7=81=B5=E5=85=BD?= =?UTF-8?q?=E5=AE=9D=E9=98=81=E7=99=BD=E6=B3=BD=E5=81=87=E6=88=98=E6=96=97?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index ab34aa03cc..1534ff31be 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -75,9 +75,9 @@ function LingShouBaoGe:BindEvent() maxRound = 20 } UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test,function () - Timer.New(function () - self:Refresh() - end,3):Start() + -- Timer.New(function () + -- self:Refresh() + -- end,3):Start() end) end) end From a3f87bb3e2c958baacbc45d5aa11c4b3ce76641a Mon Sep 17 00:00:00 2001 From: JieLing Date: Tue, 8 Jun 2021 14:32:21 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E3=80=90=E5=8C=85=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=91=E5=88=A0=E9=99=A4=E5=AF=B9=E7=A7=B0=E5=8F=B7=E7=89=B9?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AssetBundles/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AssetBundles/config.txt b/AssetBundles/config.txt index 3de95809c0..f9c6155973 100644 --- a/AssetBundles/config.txt +++ b/AssetBundles/config.txt @@ -1 +1 @@ -{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_TITLE_EFFECT_SCALE":{"desc":"", "versionCode":"1", "isActive":"1"}, "IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"1"}}} \ No newline at end of file +{"Setting":{"LanguagePackager":{"desc":"\u672c\u5730\u5316\u5904\u7406", "versionCode":"26", "isActive":"1"}, "ServerVersion":{"desc":"\u7528\u4e8e\u5207\u6362\u6b63\u5f0f\u670d\u548c\u63d0\u5ba1\u670d", "value":"0", "versionCode":"26", "isActive":"1"}, "ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83b7\u53d6DeviceID\u65b9\u6cd5", "versionCode":"24", "isActive":"1"}, "LayoutBuilderWrap":{"desc":"\u5f3a\u5236\u5237\u65b0layout\u7ec4\u4ef6\u5927\u5c0f\u7684\u65b9\u6cd5\u4fee\u6539\u5230lua\u4e2d\u8c03\u7528", "versionCode":"25", "isActive":"1"}, "IS_PLAY_VOICE":{"desc":"", "versionCode":"1", "isActive":"1"},"IS_PLAY_LOGIN_VIDEO":{"desc":"", "versionCode":"1", "isActive":"1"}}} \ No newline at end of file From f905f85a8f82a49eabe70434011b28724908bea7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 9 Jun 2021 11:49:11 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E3=80=90=E7=A4=BC=E5=8C=85=E3=80=91?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A4=E7=A9=BA=E6=93=8D=E4=BD=9C=EF=BC=8C=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Operating/OperatingManager.lua | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 185a9fc7b9..f1c5287d38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -38,15 +38,19 @@ function this.SetBasicValues(giftGoodsList) end for _, giftGoodsInfo in ipairs(giftGoodsList) do if giftGoodsInfo.goodsId and giftGoodsInfo.goodsId ~= 0 then - local rechargeConfigLocal = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId) - -- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" - -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" - -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) - if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then - else - if giftGoodsInfoList[rechargeConfigLocal.Type] then - table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo) + local rechargeConfigLocal = ConfigManager.TryGetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId) + if rechargeConfigLocal then + -- LogBlue("------充值活动-----------礼包类型:".. rechargeConfigLocal.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" + -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" + -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) + if giftGoodsInfo.endTime == 0 and giftGoodsInfo.startTime == 0 and (rechargeConfigLocal.ShowType == 25 or rechargeConfigLocal.ShowType == 26 or rechargeConfigLocal.ShowType == 8) then + else + if giftGoodsInfoList[rechargeConfigLocal.Type] then + table.insert(giftGoodsInfoList[rechargeConfigLocal.Type], giftGoodsInfo) + end end + else + LogError("服务器发过来一个前端表中不存在的礼包:"..giftGoodsInfo.goodsId) end end end From 23101cfa6023101edb0ce8aeae9d8d8870efda52 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 9 Jun 2021 12:18:14 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E3=80=90=E7=A4=BC=E5=8C=85=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E7=A9=BA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/OperatingManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index f1c5287d38..dd771ec556 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -256,7 +256,7 @@ end -- 根据类型判断相应的物品是否开启并返回相应的ID function this.GetActiveGoodsIDByType(goodsType) for goodsId, endTime in pairs(_GoodsDurationData) do - if rechargeConfig[goodsId].Type == goodsType and endTime > GetTimeStamp() then + if rechargeConfig[goodsId] and rechargeConfig[goodsId].Type == goodsType and endTime > GetTimeStamp() then return goodsId, endTime end end From 75cbaba02eeeeb660cc57b27027ed86780f683ff Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 11 Jun 2021 10:58:51 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E3=80=90=E7=AB=A0=E8=8A=82=E5=89=A7?= =?UTF-8?q?=E6=83=85=E3=80=91=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BF=87=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=BF=94=E5=9B=9E=E6=8C=82=E6=9C=BA=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Story/StoryDialoguePanel.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua index 98820b96bf..3d6c39bbd8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua @@ -60,6 +60,10 @@ function StoryDialoguePanel:BindEvent() Util.AddClick(this.btnJump, function () if jumpId == 0 then self:ClosePanel() + if static_callBack then + static_callBack() + static_callBack = nil + end else self:GoNext(jumpId) end From 41dfe3f056d931764ea6a1ecf7bd9dd159ad7186 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 15 Jun 2021 14:46:30 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E3=80=90=E7=83=AD=E6=9B=B4=E3=80=91?= =?UTF-8?q?=E5=85=88=E9=81=A3=E6=9C=8D=E7=9B=B8=E5=85=B3=E7=83=AD=E6=9B=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=EF=BC=8C=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91=E8=B7=AF=E5=BE=84=E5=88=B7=E6=96=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Editor/GameEditor/FrameTool/HotFixWindow.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index 8488914c59..a64a7cdeb7 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -253,6 +253,10 @@ namespace GameEditor.FrameTool new string[]{ "灵动-专服", "mht_china/zf", "cdn_mht_zf_release", "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[]{ "先遣-内网", "mht_china/local", "local12_cn_local", "china/local" }, + new string[]{ "先遣-测试", "mht_china/xq", "cdn_xq_test", "china/test" }, + new string[]{ "先遣-正式", "mht_china/xq", "cdn_xq_release", "china/test" }, }; static Dictionary _HotFixConfigDic = new Dictionary(); @@ -547,11 +551,14 @@ namespace GameEditor.FrameTool } log.Add("CDN TYPE: "+ info["cdn_type"]); string toolsDir = _HotFixProjectPath + "/Tools/" + info["cdn_type"]; - string command = string.Format("python UpLoad.py {0} {1} {2}>>{3}", _HotFixProjectPath + "/Root/" + hfs.dir_name, hfs.dir_cdn_setting, changeFileName, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); log.Add("TOOLS DIR: " + toolsDir); + string command = string.Format("python UpLoad.py {0} {1} {2}>>{3}", _HotFixProjectPath + "/Root/" + hfs.dir_name, hfs.dir_cdn_setting, changeFileName, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); log.Add("UPLOAD COMMAND: " + command); ProcessUtil.ProcessCommand(toolsDir, command); - + string flushCommand = string.Format("python Flush.py {0}>>{1}", hfs.cdn_version.resUrl, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); + log.Add("Flush COMMAND: " + flushCommand); + ProcessUtil.ProcessCommand(toolsDir, flushCommand); + // write log EditorUtility.DisplayProgressBar("正在生成Log文件:", logName, 1f); WriteLog(hfs.path_cdn_setting + "__HotFixLog", logName, log.ToArray()); From ab11a7c233f700c6b4c77976acc8b3bbab22bbff Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 15 Jun 2021 15:23:05 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=85=B7=E3=80=91?= =?UTF-8?q?=E7=83=AD=E6=9B=B4=E5=92=8C=E6=89=93=E5=8C=85=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 2 +- Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 7cd81d029f..a6bc9ba6d6 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -405,7 +405,7 @@ public class AutoPack : EditorWindow "git add ." + printlog, "echo git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, "git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, - + "git push", }; ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], commands); EditorUtility.ClearProgressBar(); diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index a64a7cdeb7..d5ea9209c6 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -501,6 +501,7 @@ namespace GameEditor.FrameTool EditorUtility.DisplayProgressBar("正在提交到GIT:", commitName, 1f); ProcessUtil.ProcessCommand(toPath, "git add ."); ProcessUtil.ProcessCommand(toPath, "git commit -m " + commitName); + ProcessUtil.ProcessCommand(toPath, "git push"); EditorUtility.ClearProgressBar(); } @@ -558,7 +559,6 @@ namespace GameEditor.FrameTool string flushCommand = string.Format("python Flush.py {0}>>{1}", hfs.cdn_version.resUrl, hfs.path_cdn_setting + "__HotFixLog/" + logName + ".log"); log.Add("Flush COMMAND: " + flushCommand); ProcessUtil.ProcessCommand(toolsDir, flushCommand); - // write log EditorUtility.DisplayProgressBar("正在生成Log文件:", logName, 1f); WriteLog(hfs.path_cdn_setting + "__HotFixLog", logName, log.ToArray()); @@ -568,6 +568,7 @@ namespace GameEditor.FrameTool EditorUtility.DisplayProgressBar("正在提交到GIT:", commitName, 1f); ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git add ."); ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git commit -m " + commitName); + ProcessUtil.ProcessCommand(hfs.path_cdn_setting, "git push"); EditorUtility.ClearProgressBar(); } From 562b57db73a5ac83fb23de87e76806a4e74af0d5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 17 Jun 2021 10:59:20 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E3=80=90=E5=9C=BA=E6=99=AF=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8C=95=E7=8C=B4=E6=A1=83=E5=95=86=E5=8A=A1?= =?UTF-8?q?=E5=87=BA=E5=8C=85=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scenes/Logo_mht_sw.unity | 362 ++++++++++++++++++ .../Scenes/Logo_mht_sw.unity.meta | 8 + 2 files changed, 370 insertions(+) create mode 100644 Assets/LuaFramework/Scenes/Logo_mht_sw.unity create mode 100644 Assets/LuaFramework/Scenes/Logo_mht_sw.unity.meta diff --git a/Assets/LuaFramework/Scenes/Logo_mht_sw.unity b/Assets/LuaFramework/Scenes/Logo_mht_sw.unity new file mode 100644 index 0000000000..c33cb63e00 --- /dev/null +++ b/Assets/LuaFramework/Scenes/Logo_mht_sw.unity @@ -0,0 +1,362 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!1 &2 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 16} + - component: {fileID: 42} + - component: {fileID: 44} + - component: {fileID: 43} + - component: {fileID: 5} + - component: {fileID: 3} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7cbe2940276bfc4f946d442c07229d2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!81 &5 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 +--- !u!4 &16 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!104 &22 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &24 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!114 &42 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 50 +--- !u!114 &43 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &44 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!1 &1013149005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1013149006} + - component: {fileID: 1013149007} + - component: {fileID: 1013149008} + m_Layer: 0 + m_Name: GameStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1013149006 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013149005} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.26726648, y: 0.43754014, z: -0.046788022} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1013149007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013149005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae34f89576e17114c97f3cb81dba9ff6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1013149008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013149005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa01058878b41024abbd731e7118c543, type: 3} + m_Name: + m_EditorClassIdentifier: + settingInfo: + logLevel: 0 + isDebug: 0 + bundleMode: 1 + luaBundleMode: 1 + isUpdate: 1 + isSDK: 1 + isSDKLogin: 1 + isGuide: 1 + isOpenGM: 0 +--- !u!4 &57277738265262265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1362306110787991495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7df5c5e5307f460e917e72bf75ec567, type: 3} + m_Name: + m_EditorClassIdentifier: + enableLog: 1 + networkType: 3 + tokens: + - appid: 63bdff7d90ca4720b6b6626841f0aad8 + serverUrl: https://thinkingdata.18183g.com + mode: 0 + timeZone: 0 + timeZoneId: +--- !u!1 &3471622135844523394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 57277738265262265} + - component: {fileID: 1362306110787991495} + - component: {fileID: 3471622135844523395} + - component: {fileID: 3471622135844523396} + m_Layer: 0 + m_Name: SDKConfig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3471622135844523395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3} + m_Name: + m_EditorClassIdentifier: + appid: wjtsq7xrwb48t2uw + channel: "\u592A\u521D\u884C\u5546\u52A1" +--- !u!114 &3471622135844523396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3} + m_Name: + m_EditorClassIdentifier: + appid: 970c8100f1 diff --git a/Assets/LuaFramework/Scenes/Logo_mht_sw.unity.meta b/Assets/LuaFramework/Scenes/Logo_mht_sw.unity.meta new file mode 100644 index 0000000000..3e58486f63 --- /dev/null +++ b/Assets/LuaFramework/Scenes/Logo_mht_sw.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 410a59493b3fcf84dbdaa79111f5d63d +timeCreated: 1496386600 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: From 0138a9576fc4cdbbf2307245503eba3aecb6295a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 17 Jun 2021 11:16:11 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=88=A4=E6=96=AD=E8=A6=81=E6=89=93=E7=9A=84=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=81=B5=E5=8A=A8=E5=95=86=E5=8A=A1?= =?UTF-8?q?=E6=9C=8D=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 65 +++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 26 deletions(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index a6bc9ba6d6..c94bced8f8 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -9,11 +9,18 @@ public class AutoPack : EditorWindow { static string[][] PackConfig = new string[][] { - new string[]{ "C轮v2", "Logo_gm_nosdk", "TCX_TEST_C_V2"}, - new string[]{ "灵动专服-测试", "Logo_gn_zf_test", "MHT_GN_ZF_TEST" }, - new string[]{ "灵动专服-正式", "Logo_gn_zf_release", "MHT_GN_ZF_RELEASE" }, - new string[]{ "喜扑", "Logo_cn_xipu", "MHT_CN_XIPU"}, - new string[]{ "草花", "Logo_cn_caohua", "MHT_CN_MIDDLE_WARE" }, + // 专服 + 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[]{ "喜扑", "Logo_cn_xipu", "MHT_CN_XIPU", "china/zf_test"}, + new string[]{ "草花", "Logo_cn_caohua", "MHT_CN_MIDDLE_WARE" , "china/zf_test"}, + + // 灵动商务 + new string[]{ "灵动商务", "Logo_mht_sw", "MHT_GN_SW" , "china/dev"}, + + + //先遣 }; @@ -49,6 +56,7 @@ public class AutoPack : EditorWindow static int ExportType; static bool[] Chooser; static bool isObb = false; + static string benchName; // 当前所在分支 private void OnEnable() @@ -84,6 +92,9 @@ public class AutoPack : EditorWindow [MenuItem("自动化打包/一键导出")] private static void EzBuildPack() { + + benchName = GitUtil.GetCurBenchName(); + UnityEngine.Debug.Log("当前分支:" + benchName); //创建窗口 Rect wr = new Rect(0, 0, 500, 700); var buildWin = GetWindowWithRect(wr, true); @@ -119,29 +130,31 @@ public class AutoPack : EditorWindow EditorGUILayout.LabelField("请选择要打的包:"); for(int i = 0; i < PackConfig.Length; i++) { - EditorGUILayout.BeginVertical(); - Chooser[i] = EditorGUILayout.ToggleLeft(PackConfig[i][0], Chooser[i]); - EditorGUILayout.BeginHorizontal(); - if (GUILayout.Button("编辑Config", GUILayout.Height(20f))) + if (PackConfig[i][3].Equals(benchName)) { - string tpath = _MomPackPath + PackConfig[i][2] + "/Config/" + ConfigFileName; - GameEditor.Util.ProcessUtil.OpenText(tpath); + EditorGUILayout.BeginVertical(); + Chooser[i] = EditorGUILayout.ToggleLeft(PackConfig[i][0], Chooser[i]); + EditorGUILayout.BeginHorizontal(); + if (GUILayout.Button("编辑Config", GUILayout.Height(20f))) + { + string tpath = _MomPackPath + PackConfig[i][2] + "/Config/" + ConfigFileName; + GameEditor.Util.ProcessUtil.OpenText(tpath); + } + if (GUILayout.Button("编辑Version", GUILayout.Height(20f))) + { + string tpath = _MomPackPath + PackConfig[i][2] + "/Config/" + VersionFileName; + GameEditor.Util.ProcessUtil.OpenText(tpath); + } + if (GUILayout.Button("编辑Gradle", GUILayout.Height(20f))) + { + string tpath = _MomPackPath + PackConfig[i][2] + "/build.gradle"; + GameEditor.Util.ProcessUtil.OpenText(tpath); + } + EditorGUILayout.EndHorizontal(); + EditorGUILayout.EndVertical(); + EditorGUILayout.Space(); + EditorGUILayout.Space(); } - if (GUILayout.Button("编辑Version", GUILayout.Height(20f))) - { - string tpath = _MomPackPath + PackConfig[i][2] + "/Config/" + VersionFileName; - GameEditor.Util.ProcessUtil.OpenText(tpath); - } - if (GUILayout.Button("编辑Gradle", GUILayout.Height(20f))) - { - string tpath = _MomPackPath + PackConfig[i][2] + "/build.gradle"; - GameEditor.Util.ProcessUtil.OpenText(tpath); - } - EditorGUILayout.EndHorizontal(); - EditorGUILayout.EndVertical(); - EditorGUILayout.Space(); - EditorGUILayout.Space(); - } ExportType = EditorGUILayout.Popup("请选择出包方式", ExportType, ExportTypeList); From d06bdbadd1e9440c49676e0c809c10950005466e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 17 Jun 2021 11:21:05 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=91=E4=BF=AE=E6=94=B9=E5=95=86=E5=8A=A1=E6=9C=8D?= =?UTF-8?q?=E7=9A=84=E6=89=93=E5=8C=85=E5=88=86=E6=94=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 c94bced8f8..fd26a059f4 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -17,7 +17,7 @@ public class AutoPack : EditorWindow new string[]{ "草花", "Logo_cn_caohua", "MHT_CN_MIDDLE_WARE" , "china/zf_test"}, // 灵动商务 - new string[]{ "灵动商务", "Logo_mht_sw", "MHT_GN_SW" , "china/dev"}, + new string[]{ "灵动商务", "Logo_mht_sw", "MHT_GN_SW" , "china/mht_sw"}, //先遣 From 87032a513ad55153ff21f064493b5d5aa1fa9227 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 17 Jun 2021 11:45:11 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E3=80=90=E9=85=8D=E7=BD=AE=E3=80=91?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/DOTweenSettings.asset | 30 -------------- Assets/Resources/DOTweenSettings.asset.meta | 8 ---- .../EmptyCtrllerForIL2CPP.controller | 41 ------------------- .../EmptyCtrllerForIL2CPP.controller.meta | 8 ---- Assets/Resources/version.txt | 1 - Assets/Resources/version.txt.meta | 7 ---- 6 files changed, 95 deletions(-) delete mode 100644 Assets/Resources/DOTweenSettings.asset delete mode 100644 Assets/Resources/DOTweenSettings.asset.meta delete mode 100644 Assets/Resources/EmptyCtrllerForIL2CPP.controller delete mode 100644 Assets/Resources/EmptyCtrllerForIL2CPP.controller.meta delete mode 100644 Assets/Resources/version.txt delete mode 100644 Assets/Resources/version.txt.meta diff --git a/Assets/Resources/DOTweenSettings.asset b/Assets/Resources/DOTweenSettings.asset deleted file mode 100644 index b9d431b38a..0000000000 --- a/Assets/Resources/DOTweenSettings.asset +++ /dev/null @@ -1,30 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 16995157, guid: 30caf126b3b782148918a9fc431c054a, type: 3} - m_Name: DOTweenSettings - m_EditorClassIdentifier: - useSafeMode: 1 - timeScale: 1 - useSmoothDeltaTime: 0 - maxSmoothUnscaledTime: 0.15 - showUnityEditorReport: 0 - logBehaviour: 2 - drawGizmos: 1 - defaultRecyclable: 0 - defaultAutoPlay: 3 - defaultUpdateType: 0 - defaultTimeScaleIndependent: 0 - defaultEaseType: 6 - defaultEaseOvershootOrAmplitude: 1.70158 - defaultEasePeriod: 0 - defaultAutoKill: 1 - defaultLoopType: 0 - storeSettingsLocation: 0 diff --git a/Assets/Resources/DOTweenSettings.asset.meta b/Assets/Resources/DOTweenSettings.asset.meta deleted file mode 100644 index 151ff0c289..0000000000 --- a/Assets/Resources/DOTweenSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7e47d41fa35c48748b784bd5344a9924 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/EmptyCtrllerForIL2CPP.controller b/Assets/Resources/EmptyCtrllerForIL2CPP.controller deleted file mode 100644 index 19979096b2..0000000000 --- a/Assets/Resources/EmptyCtrllerForIL2CPP.controller +++ /dev/null @@ -1,41 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: EmptyCtrllerForIL2CPP - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1107420452900571200} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1107 &1107420452900571200 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Base Layer - m_ChildStates: [] - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} diff --git a/Assets/Resources/EmptyCtrllerForIL2CPP.controller.meta b/Assets/Resources/EmptyCtrllerForIL2CPP.controller.meta deleted file mode 100644 index adf7b3c714..0000000000 --- a/Assets/Resources/EmptyCtrllerForIL2CPP.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c2cec057eeca1b34d84823ee7d5cfa36 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/version.txt b/Assets/Resources/version.txt deleted file mode 100644 index f6ad438ff0..0000000000 --- a/Assets/Resources/version.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.3", "subChannel":"1", "version":"0.16.1", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file diff --git a/Assets/Resources/version.txt.meta b/Assets/Resources/version.txt.meta deleted file mode 100644 index b2d6edf9fd..0000000000 --- a/Assets/Resources/version.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 52da38ae9a344c548a25e90cc205dc91 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From e88dcb786349e3d3af587928b7dc02ce8107def5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 18 Jun 2021 16:03:27 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E3=80=90=E7=83=AD=E6=9B=B4=E3=80=91?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93tag=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameEditor/FrameTool/HotFixWindow.cs | 177 +++++++++++++++--- 1 file changed, 152 insertions(+), 25 deletions(-) diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs index 17d118d5e7..7dbe1f31e4 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs @@ -108,6 +108,24 @@ namespace GameEditor.FrameTool } return size / 1048576; } + + public static void WriteLog(string path, string name, string[] contents) + { + + UnityEngine.Debug.Log("创建log文件"); + UnityEngine.Debug.Log(path); + UnityEngine.Debug.Log(name); + if (!Directory.Exists(path)) + { + Directory.CreateDirectory(path); + } + string filePath = Path.Combine(path, name) + ".log"; + //if (!File.Exists(filePath)) + //{ + // File.Create(filePath).Close(); + //} + File.WriteAllLines(filePath, contents); + } } class HotFixConfig @@ -183,13 +201,11 @@ namespace GameEditor.FrameTool public string local_files_path = ""; public decimal local_cdn_size = 0; // git与cdn比较 热更文件的文件大小 - public decimal project_cdn_size = 0; // 工程与cdn比较 热更文件的文件大小 - public List local_cdn_list; // git与cdn比较 热更文件列表 - public List project_cdn_list; // 工程与cdn比较 热更文件列表 public VersionTxt local_version; public VersionTxt cdn_version; + public Hashtable cdn_setting; public HotFixSetting(string _desc, string _dir_name, string _dir_cdn_setting) { @@ -215,29 +231,130 @@ namespace GameEditor.FrameTool // GIT位置 local_files_path = HotfixWindow._HotFixProjectPath + "/Root/" + dir_name + "/" + AppConst.PlatformPath + "/"; - // 读取version文件 - string json = File.ReadAllText(path_cdn_setting + AppConst.GameVersionFile); - local_version = JsonUtility.FromJson(json); - - // 下载cdn上的files文件 - HotFixTool.RegetExternalFile(local_version.resUrl + AppConst.PlatformPath, cdn_files_path, "files.unity3d"); - - - // 读取version文件 - HotFixTool.RegetExternalFile(local_version.resUrl + AppConst.PlatformPath, cdn_files_path, AppConst.GameVersionFile); - cdn_version = JsonUtility.FromJson(File.ReadAllText(cdn_files_path + AppConst.GameVersionFile)); + LoadSetting(); + LoadLocalVersion(); + LoadCDN(); // 计算差异文件 local_cdn_list = HotFixTool.GetDiffList(HotFixTool.GetFilesList(local_files_path), HotFixTool.GetFilesList(cdn_files_path)); - project_cdn_list = HotFixTool.GetDiffList(HotFixTool.GetFilesList(project_files_path), HotFixTool.GetFilesList(cdn_files_path)); // 计算大小 local_cdn_size = HotFixTool.GetDiffSize(local_cdn_list); - project_cdn_size = HotFixTool.GetDiffSize(project_cdn_list); // isCalSize = true; } + + + public void LoadSetting() + { + string setting = File.ReadAllText(path_cdn_setting + "Setting.txt", System.Text.Encoding.UTF8); + cdn_setting = MiniJSON.jsonDecode(setting) as Hashtable; + } + public string GetSettingConfig(string key) + { + if (cdn_setting == null || !cdn_setting.ContainsKey(key)) + { + return null; + } + return cdn_setting[key] as string; + } + + public void LoadLocalVersion() + { + // 读取version文件 + string json = File.ReadAllText(path_cdn_setting + AppConst.GameVersionFile); + local_version = JsonUtility.FromJson(json); + } + + public void LoadCDN() + { + if(local_version == null) + { + UnityEngine.Debug.LogError("请先加载本地version文件"); + return; + } + // 下载cdn上的files文件 + HotFixTool.RegetExternalFile(local_version.resUrl + AppConst.PlatformPath, cdn_files_path, "files.unity3d"); + // 下载version文件 + HotFixTool.RegetExternalFile(local_version.resUrl + AppConst.PlatformPath, cdn_files_path, AppConst.GameVersionFile); + // 读取version + string json = File.ReadAllText(cdn_files_path + AppConst.GameVersionFile); + cdn_version = JsonUtility.FromJson(json); + } + public void DOUpload() + { + string logName; + string updateName; + string changeFileName; + string logPath = path_cdn_setting + "/__HotFixLog/"; + string tagName; + List log = new List(); + //if (local_cdn_list.Count <= 0) + //{ + // UnityEngine.Debug.Log("未检测到文件改动"); + // return; + //} + // 初始化数据 + updateName = dir_name + "_" + dir_cdn_setting + "_" + DateTime.Now.ToString("yyyy_MM_dd_HH_mm_ss"); + changeFileName = updateName.Replace("/", "$"); + logName = changeFileName + "_UpLoad"; + tagName = "hotfix/" + dir_name + "/" + dir_cdn_setting + "/" + local_version.version; + EditorUtility.DisplayProgressBar("正在获取数据:", updateName, 0f); + log.Add("热更文件版本:" + updateName); + log.Add("热更版本号:" + local_version.version); + log.Add("热更大小:" + local_cdn_size); + // copy unity3d + log.Add("热更文件:"); + List changeFile = new List(); + foreach (ResourceFile rf in local_cdn_list) + { + changeFile.Add(rf.fileName); + log.Add(rf.fileName); + } + changeFile.Add(UpdateConfigs.FILES); + log.Add(UpdateConfigs.FILES); + // write ChangeList + EditorUtility.DisplayProgressBar("正在生成文件变化列表", changeFileName, 1f); + HotFixTool.WriteLog(logPath, changeFileName, changeFile.ToArray()); + // upload to cdn + EditorUtility.DisplayProgressBar("正在上传热更文件", changeFileName, 1f); + + string cdnType = GetSettingConfig("cdn_type"); + if (cdnType == null) + { + UnityEngine.Debug.LogError("CDN配置错误"); + EditorUtility.ClearProgressBar(); + return; + } + log.Add("CDN TYPE: " + cdnType); + string toolsDir = HotfixWindow._HotFixProjectPath + "/Tools/" + cdnType; + log.Add("TOOLS DIR: " + toolsDir); + string command = string.Format("python UpLoad.py {0} {1} {2}>>{3}", HotfixWindow._HotFixProjectPath + "/Root/" + dir_name, dir_cdn_setting, changeFileName, logPath + logName + ".log"); + log.Add("UPLOAD COMMAND: " + command); + ProcessUtil.ProcessCommand(toolsDir, command); + string flushCommand = string.Format("python Flush.py {0}>>{1}", cdn_version.resUrl, logPath + logName + ".log"); + log.Add("Flush COMMAND: " + flushCommand); + ProcessUtil.ProcessCommand(toolsDir, flushCommand); + // write log + EditorUtility.DisplayProgressBar("正在生成Log文件:", logName, 1f); + HotFixTool.WriteLog(logPath, logName, log.ToArray()); + // git commit + string commitName = desc + "更新:" + updateName; + EditorUtility.DisplayProgressBar("正在提交到GIT:", commitName, 1f); + ProcessUtil.ProcessCommand(path_cdn_setting, "git add ."); + ProcessUtil.ProcessCommand(path_cdn_setting, "git commit -m " + commitName); + ProcessUtil.ProcessCommand(path_cdn_setting, "git push"); + // git tag + string dir = Application.dataPath.Replace("/Assets", ""); + ProcessUtil.ProcessCommand(dir, string.Format("git tag -a {0} -m {1}", tagName, commitName)); + ProcessUtil.ProcessCommand(dir, "git push origin --tags"); + UnityEngine.Debug.Log("更新完成,游戏工程标签为:" + tagName + ",热更工程提交:" + commitName); + + EditorUtility.ClearProgressBar(); + } + + } //看热更大小 @@ -374,7 +491,9 @@ namespace GameEditor.FrameTool } if (GUILayout.Button("更新到GIT", GUILayout.Height(20f))) { - HotfixConfimWindow.Create("是否要将工程热更文件同步到GIT: " + _CurConfig.desc, _CurConfig.project_local_list, () => + string title = "是否要将工程热更文件同步到GIT: " + _CurConfig.desc; + string content = string.Format("更新大小:{0}", HotFixTool.GetDiffSize(_CurConfig.project_local_list).ToString("0.00") + "M"); + HotfixConfimWindow.Create(title, content, _CurConfig.project_local_list, () => { UpdateUnity3dToGit(_CurConfig); }); @@ -398,7 +517,6 @@ namespace GameEditor.FrameTool EditorGUILayout.LabelField("CDN当前版本号:" + (hfs.cdn_version == null ? "" : hfs.cdn_version.version)); EditorGUILayout.LabelField("GIT到CDN:" + hfs.local_cdn_size.ToString("0.00") + "M"); - //EditorGUILayout.LabelField("工程到CDN:" + hfs.project_cdn_size.ToString("0.00") + "M"); EditorGUILayout.EndVertical(); if (GUILayout.Button("编辑Setting", GUILayout.Height(30f), GUILayout.Width(100f))) @@ -422,9 +540,13 @@ namespace GameEditor.FrameTool } if (GUILayout.Button("更新", GUILayout.Height(30f), GUILayout.Width(100f))) { - HotfixConfimWindow.Create("是否要热更: " + hfs.desc, hfs.local_cdn_list, () => + //重新加载本地version + hfs.LoadLocalVersion(); + string title = "是否要热更: " + hfs.desc; + string content = string.Format("更新大小:{0},CDN当前版本:{1},更新后版本{2}", HotFixTool.GetDiffSize(hfs.local_cdn_list).ToString("0.00") + "M", hfs.cdn_version.version, hfs.local_version.version); + HotfixConfimWindow.Create(title, content, hfs.local_cdn_list, () => { - UpdateUnity3dToCDN(hfs); + hfs.DOUpload(); }); } EditorGUILayout.EndHorizontal(); @@ -596,20 +718,22 @@ namespace GameEditor.FrameTool //看热更大小 public class HotfixConfimWindow : EditorWindow { + string title; string content; List diffList; Action a; Vector2 _scp = Vector2.zero; - public static void Create(string content, List diffList, Action a) + public static void Create(string title, string content, List diffList, Action a) { HotfixConfimWindow window = (HotfixConfimWindow)EditorWindow.GetWindow(typeof(HotfixConfimWindow), true, "提示", true); - window.SetContent(content, diffList, a); + window.SetContent(title, content, diffList, a); window.ShowAuxWindow(); } - public void SetContent(string _content, List _diffList, Action _a) + public void SetContent(string _title, string _content, List _diffList, Action _a) { + title = _title; content = _content; diffList = _diffList; a = _a; @@ -618,14 +742,17 @@ namespace GameEditor.FrameTool private void OnGUI() { EditorGUILayout.BeginVertical(); - EditorGUILayout.LabelField(content); + EditorGUILayout.LabelField(title); _scp = EditorGUILayout.BeginScrollView(_scp); foreach(ResourceFile rf in diffList) { EditorGUILayout.LabelField(rf.fileName); } + EditorGUILayout.LabelField("files.unity3d"); + EditorGUILayout.LabelField(AppConst.GameConfigFile); + EditorGUILayout.LabelField(AppConst.GameVersionFile); EditorGUILayout.EndScrollView(); - EditorGUILayout.LabelField("更新大小:" + HotFixTool.GetDiffSize(diffList).ToString("0.00") + "M"); + EditorGUILayout.LabelField(content);//"更新大小:" + HotFixTool.GetDiffSize(diffList).ToString("0.00") + "M"); EditorGUILayout.BeginHorizontal(); if (GUILayout.Button("取消")){ Close();