From 7c02e82218dfe0283503b8b4da402cd1e23c206e Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 28 Aug 2020 10:14:46 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=9B=9E=E6=98=A5?= =?UTF-8?q?=E6=95=A3bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua index fa75bd25bd..067cace395 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua @@ -90,6 +90,7 @@ function this:RemoveListener() end function this:OnShow(_parent,...) + oldChoosed = nil parent=_parent sortingOrder = _parent.sortingOrder --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 @@ -142,8 +143,10 @@ function this.RefreshPanel() hpExp.value=v.heroHp/10000 Util.SetGray(o,v.heroHp<=0) - choosed:SetActive(i==1) - if i==1 then + LogGreen("MapTrialManager.selectHeroDid"..MapTrialManager.selectHeroDid) + choosed:SetActive(false) + if MapTrialManager.selectHeroDid == v.heroId then + choosed:SetActive(true) oldChoosed=choosed selectHeroDid=v.heroId end From cdc5c07b841ff0cbaa09968c62f630629f1e3292 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 28 Aug 2020 10:36:09 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E5=9C=A8=E5=89=AF=E6=9C=AC=E7=95=8C=E9=9D=A2=E7=9A=84=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Player/RedpotManager.lua | 5 ++--- .../~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 8486907fd7..ef5437cef1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -245,7 +245,7 @@ function this.InitRedPointAllRelate() -- 成就 RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain) --大闹天宫 天宫秘宝 - RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.Expedition) + RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.OrdinaryExplore) end -- 注册红点检测方法 @@ -394,8 +394,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) RPData:AddCheckFunc(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed) RPData:AddCheckFunc(RedPointType.PoZhenZhuXianRecharge, OperatingManager.CheckLeiJiChongZhiRedData) - - RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION) + RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING) RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua index 067cace395..e5fc72e8c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua @@ -143,7 +143,6 @@ function this.RefreshPanel() hpExp.value=v.heroHp/10000 Util.SetGray(o,v.heroHp<=0) - LogGreen("MapTrialManager.selectHeroDid"..MapTrialManager.selectHeroDid) choosed:SetActive(false) if MapTrialManager.selectHeroDid == v.heroId then choosed:SetActive(true) From 2d9d097d989b78f3d8496fa71703b6841267fb7a Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 12:08:23 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=85=E5=B3=B0?= =?UTF-8?q?=E8=B5=9B=E6=8C=89=E9=92=AE=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 4e6eeb7c9e..adaa2b770e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1411,7 +1411,7 @@ function this.TimeFormat() local startTime = ArenaTopMatchManager.GetTopMatchTime() local tempTime = startTime - PlayerManager.serverTime -- 当日五点开始显示 - if tempTime < 16 * 60 * 60 then + if tempTime > 0 and tempTime < 16 * 60 * 60 then SetTopMatchActive(true) this.topMatchTime.text = "距开始\n"..TimeToHMS(tempTime) else From 62eb4886288399cba0b96ab572c3a3a3349d3330 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 12:34:19 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=80=80=E5=87=BA=E6=97=B6=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scripts/Manager/NetworkManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs b/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs index 56b7803c7b..65f951abe9 100644 --- a/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs @@ -53,7 +53,7 @@ namespace GameLogic /// /// /// - new void OnDestroy() + void OnDestroy() { Reset(); } From 01fc7cae5101ff57df1f83f7dd40b30f9ef1bab1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 28 Aug 2020 13:48:09 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Map/MapPanel.prefab | 20 +++++++++---------- .../~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Map/MapTrialManager.lua | 15 ++++++++++++++ .../~Lua/Modules/Map/TrialMapPanel.lua | 4 ++++ .../~Lua/Modules/Player/RedpotManager.lua | 3 +++ .../~Lua/Modules/Popup/TrialRewardPopup.lua | 1 + 6 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index adf447c8a4..7a4dd187a6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -54966,7 +54966,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -101993,7 +101993,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -122258,12 +122258,12 @@ GameObject: - component: {fileID: 8372953808703828970} - component: {fileID: 4701517501157699323} m_Layer: 5 - m_Name: btn + m_Name: redPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &876998903884338440 RectTransform: m_ObjectHideFlags: 0 @@ -122280,8 +122280,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4.3, y: 4.7} - m_SizeDelta: {x: 142, y: 141.8} + m_AnchoredPosition: {x: 45.3, y: 45.7} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8372953808703828970 CanvasRenderer: @@ -122304,14 +122304,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} - m_RaycastTarget: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -122381,7 +122381,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f8a67cf17b..3439c66885 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -592,6 +592,7 @@ RedPointType = { LegendExplore = 118, --车迟斗法副本 EndLess = 119,--无尽副本 Trial = 121,--森罗幻境 + TrialReward = 1211,--森罗任务 -- 充值 Recharge = 120, diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 39427ee27f..321611df69 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -206,6 +206,20 @@ function this.GetTrialRewardState(id) return 1 end end +--任务红点检测 +function this.TrialRewardRedPointCheck() + local d={} + for _, configInfo in ConfigPairs(trialKillConfig) do + table.insert(d, configInfo) + end + for i = 1, #d do + local state = MapTrialManager.GetTrialRewardState(d[i].Id) + if state == 1 then + return true + end + end + return false +end --设置试练奖励信息 function this.SetTrialRewardInfo(v) @@ -222,6 +236,7 @@ end --设置试练已杀小怪数量 function this.SetKillCount(v) + CheckRedPointStatus(RedPointType.TrialReward) this.killCount=v end --获取已杀小怪数量 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index b3cf6b2abd..b87494f6fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -70,6 +70,9 @@ function TrialMapPanel:InitComponent(root, mapPanel) --boss召唤特效 this.bossEffect = Util.GetGameObject(root, "UI_effect_shilian_tab") this.energyRoot = Util.GetGameObject(root, "stepROot") + + this.rewardRedPoint = Util.GetGameObject(root,"leftCenter/btnReward/redPoint") + BindRedPointObject(RedPointType.TrialReward, this.rewardRedPoint) end @@ -461,6 +464,7 @@ function TrialMapPanel:OnClose() end function TrialMapPanel:OnDestroy() + ClearRedPointObject(RedPointType.TrialReward) SubUIManager.Close(this.upView) heroList={} end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index ef5437cef1..b9740984cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -107,6 +107,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane) RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane) + RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial) RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane) RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat) @@ -399,8 +400,10 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING) RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY) + --万象境副本 RPData:AddCheckFunc(RedPointType.People_Mirror, XuanYuanMirrorManager.CarbonRedCheck) RPData:AddCheckFunc(RedPointType.Trial, MapTrialManager.TrialRedCheck) + RPData:AddCheckFunc(RedPointType.TrialReward, MapTrialManager.TrialRewardRedPointCheck) RPData:AddCheckFunc(RedPointType.EndLess, EndLessMapManager.EndlessRedCheck) RPData:AddCheckFunc(RedPointType.QinglongSerectTreasure, QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 29eccafd9a..b7502cdc11 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -108,6 +108,7 @@ function this.SetScrollPre(root,data) mask:SetActive(true) getBtn:SetActive(false) this.RefreshPanel() + CheckRedPointStatus(RedPointType.TrialReward) end) end) end) From 238aa1920905fb10f34495fd3329e5c146b6605a Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 28 Aug 2020 14:01:34 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E6=83=85=E6=8A=A5?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=A3=85=E5=A4=87=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 4a3208c1f1..124eca7efb 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -468,7 +468,7 @@ function this.NextCurEquipData() end --界面关闭时调用(用于子类重写) function RoleEquipChangePopup:OnClose() - + nextSuitProGo = {} end --界面销毁时调用(用于子类重写) From 8d6c2d3adfc433e8349946df606e045049c3bd94 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 28 Aug 2020 14:06:08 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E3=80=90=E5=AE=9D=E7=89=A9=E3=80=91?= =?UTF-8?q?=E9=87=91=E5=B8=81=E4=B8=8D=E8=B6=B3=EF=BC=8C=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E5=90=88=E6=88=90=E6=B2=A1=E6=9C=89=E5=90=88=E7=90=86=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Compound/view/CompoundPanel_Treasure.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 0e671f68db..61aabc78d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -227,6 +227,7 @@ end --一种装备一种装备的循环检测 金币能合成的数量 与 背包装备能合成的数量 取最小值 然后扣除临时消耗道具 --最后所有装备存在curPosEquips 与 之前背包 bagPosEquips 作比较 看合成了什么装备 删除了什么装备 和计算消耗材料 function this.AutoCompound(_position) + local goldIsEnough = true --表数据 local curPosEquips = EquipTreasureManager.GetAllTabletTreasuresByRaceAndType(_position)--,curSelectEquip.equipType) --实际数据 @@ -304,6 +305,8 @@ function this.AutoCompound(_position) --LogGreen("合成curPosEquipsData[equipData.equipType][equipData.quantity]之后:"..curPosEquipsData[equipData.equipType][equipData.quantity]) end end + else + goldIsEnough = false end end local origiData = EquipTreasureManager.GeEquipTreasureDatas(_position) @@ -313,12 +316,16 @@ function this.AutoCompound(_position) --LogGreen("m:"..m.." origiData[i][n]:"..origiData[i][n]) if m > origiData[i][n] then local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelConfig,"Location",i,"Level",n,"Race",_position) + local num = m - origiData[i][n] --LogGreen("config.id:"..config.Id.." num:"..m - origiData[i][n]) - table.insert(endReward,{config.Id,m - origiData[i][n]}) + table.insert(endReward,{config.Id,num}) end end end - if LengthOfTable(endReward) < 1 then + if not goldIsEnough and LengthOfTable(endReward) < 1 then + PopupTipPanel.ShowTip("金币不足,无法合成") + return + elseif LengthOfTable(endReward) < 1 then PopupTipPanel.ShowTip(Language[12258]) return end From ad2ec008812fa613b27f28882f4e1714c525d87f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 15:29:57 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E6=88=90=E9=95=BF=E5=9F=BA=E9=87=91?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E9=9A=90=E5=8A=A0=E5=85=A5=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 2 ++ .../~Lua/Modules/Operating/OperatingPanel.lua | 9 ++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 8aff68d615..8ce9ebb398 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -44,7 +44,7 @@ function this.LoginRequest(openId, func) data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or "" data.openId = openId data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid - data.platform_s = AppConst.isSDK and "ADR" or "PC" + data.platform_s = AppConst.Platform --and "ADR" or "PC" local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.LOGIN_REQUEST, MessageTypeProto_pb.LOGIN_RESPONSE, msg, function(buffer) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 13d7d84879..cf3fed272f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -201,6 +201,8 @@ end function this.GetGrowthRedPointState() local redPoint = false + local hasGift = OperatingManager.HasGoodsByShowType(4) + if not hasGift then return false end local giftGoodsInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward) if giftGoodsInfo then return false end local openId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index c0d584e4a0..d878fe0cc1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -215,12 +215,15 @@ function OperatingPanel:RefreshTabStatus() --判断成长基金活动是否开启或结束(16是最后一档活动ActivityId) local t2 = false local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward) - local singleRewardData if GrowthRewardId then--是否开启 t2 = true end - if GrowthRewardId == 16 then--是否结束 - singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324) + local hasGift = OperatingManager.HasGoodsByShowType(4) + if t2 and not hasGift then + t2 = false + end + if t2 and GrowthRewardId == 16 then--是否结束 + local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, 5324) if not singleRewardData then t2 = false else From dd1493ee90913e9cb7c75d7c585662a3084e6d99 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 29 Aug 2020 15:14:09 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E3=80=90=E7=A2=8E=E7=89=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E3=80=91=E7=A1=AE=E8=AE=A4=E8=B4=AD=E4=B9=B0=E5=92=8C?= =?UTF-8?q?=E7=A2=8E=E7=89=87=E5=90=88=E6=88=90=E6=97=B6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=A2=8E=E7=89=87=E9=81=93=E5=85=B7=E7=9A=84?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=92=8C=E7=A2=8E=E7=89=87=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 8 ++++---- .../~Lua/Modules/Shop/ShopBuyPopup.lua | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 7fbe74f3d4..fd073fd8d3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -5081,9 +5081,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316.40005, y: -73.150055} + m_AnchoredPosition: {x: 0.000057485686, y: -73.150055} m_SizeDelta: {x: 0, y: 151} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &5729675956691850897 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19668,9 +19668,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316.40002, y: -73.150055} + m_AnchoredPosition: {x: 0.000028742843, y: -73.150055} m_SizeDelta: {x: 0, y: 151} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &4796361513380277662 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua index 0c4c5b56e1..eb0d893dcb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua @@ -94,6 +94,7 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId) this.shopType = shopType this.shopItemId = shopItemId this.shopItemInfo = ShopManager.GetShopItemInfo(shopItemId) + LogGreen(shopItemId..":shopItemId") this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId) -- 商品基础信息显示 @@ -104,7 +105,14 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) this.itemContent.text = string.gsub(itemConfig[goodsId].ItemDescribe, "\\n", "\n") this.itemIcon.sprite = SetIcon(goodsId) - this.itemBg.sprite = SetFrame(goodsId) + if itemConfig[this.shopItemInfo.Goods[1][1]].ItemType == 2 then + this.itemBg.sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[this.shopItemInfo.Goods[1][1]].Quantity)) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(true) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):GetComponent("Image").sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(itemConfig[this.shopItemInfo.Goods[1][1]].PropertyName)) + else + this.itemBg.sprite = SetFrame(goodsId) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(false) + end this.itemNum.text = this.goods[1][2] -- 计算最大可购买的数量 local countLimitNum = ShopManager.GetShopItemLimitBuyCount(shopItemId) From 638022dbadf8d02ef881587ec8992850e6623f31 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 29 Aug 2020 15:17:48 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E3=80=90=E4=BA=94=E6=98=9F=E6=88=90?= =?UTF-8?q?=E9=95=BF=E7=A4=BC=E3=80=91=E6=8B=8D=E8=84=B8=E5=9B=BE=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E2=80=9C=E6=88=98=E2=80=9D=E5=AD=97=E6=9C=89=E9=98=B4?= =?UTF-8?q?=E5=BD=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UpGradePackage/UpGradePackagePanel.prefab | 74 ------------------- 1 file changed, 74 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab index 378323cbc3..e8ca05f7a3 100644 --- a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab @@ -43979,80 +43979,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6406938328886149404 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3122847029739947333} - - component: {fileID: 9172115513959909474} - - component: {fileID: 6269553500272781496} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3122847029739947333 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6406938328886149404} - 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: 2931217454655974565} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9172115513959909474 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6406938328886149404} - m_CullTransparentMesh: 0 ---- !u!114 &6269553500272781496 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6406938328886149404} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.8} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &6801484805305654314 GameObject: m_ObjectHideFlags: 0 From b35000e14fec92cb876e9306b6e29f661a7587ae Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 15:36:57 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dupdatepanel=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab index 4cc8b066bd..c9702840b3 100644 --- a/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab +++ b/Assets/ManagedResources/UpdatePanel/UpdatePanel.prefab @@ -2185,7 +2185,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 From 83b0ab25b2e2191dd82f2b414e6b9759ef1059fa Mon Sep 17 00:00:00 2001 From: JieLing Date: Fri, 28 Aug 2020 16:09:03 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=B5=84=E6=BA=90ab?= =?UTF-8?q?=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Audio/Skill/actor_voc/Audio_battle_vo_jhsn01.mp3.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_vo_mjn01.mp3.meta | 4 ++-- .../Audio/Skill/actor_voc/Audio_battle_vo_pxps01.mp3.meta | 4 ++-- .../DynamicAtlas/Skill/c_axl_00061_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_dz_00058_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_gyps_00020_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_hdxj_00066_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_jhsn_00068_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_jll_00059_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_jlzz_00060_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_jy_00055_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_lsx_00069_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_md_00064_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_mjn_00063_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_mz_00062_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_nxq_00054_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_sdxj_00067_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_ygl_00056_t9.png.meta | 4 ++-- .../DynamicAtlas/Skill/c_yhj_00057_t9.png.meta | 4 ++-- Assets/ManagedResources/Fonts/ArtFont_3.meta | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_jhsn01.mp3.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_jhsn01.mp3.meta index 3270844f7e..f9b3f070d4 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_jhsn01.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_jhsn01.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_jhsn01 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_mjn01.mp3.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_mjn01.mp3.meta index 70d9c0e4c7..5ed3efd785 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_mjn01.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_mjn01.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_mjn01 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_pxps01.mp3.meta b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_pxps01.mp3.meta index bc7277a463..9d0cbe5c93 100644 --- a/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_pxps01.mp3.meta +++ b/Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_vo_pxps01.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/audio/skill/actor_voc/audio_battle_vo_pxps01 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_axl_00061_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_axl_00061_t9.png.meta index 426888ec29..f88eeb2fa4 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_axl_00061_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_axl_00061_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_axl_00061_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_dz_00058_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_dz_00058_t9.png.meta index 4a4918f6df..2f3b60ce1d 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_dz_00058_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_dz_00058_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_dz_00058_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_gyps_00020_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_gyps_00020_t9.png.meta index b808dff6e1..e3c60f8801 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_gyps_00020_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_gyps_00020_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_gyps_00020_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_hdxj_00066_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_hdxj_00066_t9.png.meta index 9a795202d3..7aa5952e03 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_hdxj_00066_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_hdxj_00066_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_hdxj_00066_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_jhsn_00068_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_jhsn_00068_t9.png.meta index a1274b0689..d41f9f2db5 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_jhsn_00068_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_jhsn_00068_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_jhsn_00068_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_jll_00059_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_jll_00059_t9.png.meta index 04d6f5788d..cddc5fc8f6 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_jll_00059_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_jll_00059_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_jll_00059_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_jlzz_00060_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_jlzz_00060_t9.png.meta index 1d40287350..45ab2e20f8 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_jlzz_00060_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_jlzz_00060_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_jlzz_00060_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_jy_00055_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_jy_00055_t9.png.meta index e2623e8d0c..95d7a8bc2d 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_jy_00055_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_jy_00055_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_jy_00055_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_lsx_00069_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_lsx_00069_t9.png.meta index 6e07dbd25f..a5ab17c22f 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_lsx_00069_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_lsx_00069_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_lsx_00069_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_md_00064_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_md_00064_t9.png.meta index ae68db9b19..f9961dbbdb 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_md_00064_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_md_00064_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_md_00064_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_mjn_00063_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_mjn_00063_t9.png.meta index aad0ecf706..1c7acc275b 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_mjn_00063_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_mjn_00063_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_mjn_00063_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_mz_00062_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_mz_00062_t9.png.meta index f134a53ed6..9f0bd5d1e9 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_mz_00062_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_mz_00062_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_mz_00062_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_nxq_00054_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_nxq_00054_t9.png.meta index f09cdf1b5d..c6ee3bff22 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_nxq_00054_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_nxq_00054_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_nxq_00054_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_sdxj_00067_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_sdxj_00067_t9.png.meta index a780bfba5b..f37578d7d3 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_sdxj_00067_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_sdxj_00067_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_sdxj_00067_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_ygl_00056_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_ygl_00056_t9.png.meta index 8373f54425..9b9cf4c0eb 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_ygl_00056_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_ygl_00056_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_ygl_00056_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/Skill/c_yhj_00057_t9.png.meta b/Assets/ManagedResources/DynamicAtlas/Skill/c_yhj_00057_t9.png.meta index cb5545919d..5712b779c3 100644 --- a/Assets/ManagedResources/DynamicAtlas/Skill/c_yhj_00057_t9.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/Skill/c_yhj_00057_t9.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/dynamicatlas/skill/c_yhj_00057_t9 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Fonts/ArtFont_3.meta b/Assets/ManagedResources/Fonts/ArtFont_3.meta index 558ede5be2..b52e6b40c5 100644 --- a/Assets/ManagedResources/Fonts/ArtFont_3.meta +++ b/Assets/ManagedResources/Fonts/ArtFont_3.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/fonts/artfont_3 + assetBundleVariant: unity3d From 6da8bdb3aea889ff8ebc82af0da15de0ed061c4e Mon Sep 17 00:00:00 2001 From: JieLing Date: Fri, 28 Aug 2020 16:09:41 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/LuaFramework/Scenes/Logo.unity | 7 ++++--- ProjectSettings/ProjectSettings.asset | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Assets/LuaFramework/Scenes/Logo.unity b/Assets/LuaFramework/Scenes/Logo.unity index 006b678c82..623356623a 100644 --- a/Assets/LuaFramework/Scenes/Logo.unity +++ b/Assets/LuaFramework/Scenes/Logo.unity @@ -309,7 +309,7 @@ MonoBehaviour: enableLog: 1 networkType: 3 tokens: - - appid: debug-appid + - appid: a74fa0e580424c67ab8e7c9d8deb1461 serverUrl: http://thinkingdata.18183g.com mode: 1 timeZone: 0 @@ -345,7 +345,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3} m_Name: m_EditorClassIdentifier: - appid: wjtsq7xrwb48t2uw + appid: b9hrb9imz2ztwbjx + channel: "TCX-\u65B0\u9A6C\u6FB3-GP\u6D4B\u8BD5\u5305" --- !u!114 &3471622135844523396 MonoBehaviour: m_ObjectHideFlags: 0 @@ -358,4 +359,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3} m_Name: m_EditorClassIdentifier: - appid: + appid: f5ea84ab77 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 049b524e49..a305ad1db0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: Test - productName: "\u5185\u7F51\u6D4B\u8BD5\u5305" + productName: "\u592A\u521D\u884C" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} @@ -155,7 +155,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.mht.tcxcsb.project + Android: com.tcxazcsb.pass Standalone: com.doudou.dwc Tizen: com.junfine.luaframework iOS: com.doudou.dwc @@ -248,11 +248,11 @@ PlayerSettings: clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 2 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: E:/Git/mht_haiwai_chubaozipTest/mhthw_test.keystore + AndroidKeyaliasName: mhthwtest AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1