diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index b49cd38e2a..59afb10bcc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -1819,8 +1819,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: 0, y: 122.73} - m_SizeDelta: {x: 221.93, y: 535.73} + m_AnchoredPosition: {x: 0, y: 58} + m_SizeDelta: {x: 221.9, y: 478.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6539019437747178148 CanvasRenderer: @@ -1837,7 +1837,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 479172598193990297} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -9046,7 +9046,7 @@ ParticleSystem: --- !u!199 &4777639059258701071 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14103,7 +14103,7 @@ ParticleSystem: --- !u!199 &3410931527795591877 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14835,7 +14835,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 301.8, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8466396958545835993 @@ -20605,7 +20605,7 @@ ParticleSystem: --- !u!199 &8980732446303756264 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20729,7 +20729,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9f24cdeec6201014a8771ad4417a383e, type: 3} + m_Sprite: {fileID: 21300000, guid: 58b67c9752798ab4fb8a76f3dbcbc9d4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21784,7 +21784,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9f24cdeec6201014a8771ad4417a383e, type: 3} + m_Sprite: {fileID: 21300000, guid: 1a2ed3d281da42944b13b7a4c6a5d205, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24486,7 +24486,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 301.8, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2578608009256515125 @@ -34738,7 +34738,7 @@ ParticleSystem: --- !u!199 &321836528266777232 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40355,7 +40355,7 @@ ParticleSystem: --- !u!199 &3624021359470482407 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45940,7 +45940,7 @@ ParticleSystem: --- !u!199 &3696223909751564976 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51208,8 +51208,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: 0, y: 122.73} - m_SizeDelta: {x: 221.93, y: 535.73} + m_AnchoredPosition: {x: 0, y: 58} + m_SizeDelta: {x: 221.9, y: 478.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1778051123202652440 CanvasRenderer: @@ -51226,7 +51226,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6001109951519988260} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -52517,7 +52517,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 301.8, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4408012558262011278 @@ -52815,7 +52815,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 301.8, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2894409005864471884 @@ -53148,7 +53148,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9f24cdeec6201014a8771ad4417a383e, type: 3} + m_Sprite: {fileID: 21300000, guid: 0f2cc64e40e26e645b9f4ab0e3f793b8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -53678,7 +53678,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9f24cdeec6201014a8771ad4417a383e, type: 3} + m_Sprite: {fileID: 21300000, guid: cd2ca249349cd094d933065a76dd9f73, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -54455,8 +54455,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: 0, y: 122.73} - m_SizeDelta: {x: 221.93, y: 535.73} + m_AnchoredPosition: {x: 0, y: 58} + m_SizeDelta: {x: 221.9, y: 478.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &280362301751734759 CanvasRenderer: @@ -54473,7 +54473,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6907778033612809400} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -61327,7 +61327,7 @@ ParticleSystem: --- !u!199 &2953780818559839100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -65973,7 +65973,7 @@ ParticleSystem: --- !u!199 &2949702989991448651 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -66066,7 +66066,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 301.8, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4911264467855620335 @@ -66409,8 +66409,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: 0, y: 122.73} - m_SizeDelta: {x: 221.93, y: 535.73} + m_AnchoredPosition: {x: 0, y: 58} + m_SizeDelta: {x: 221.9, y: 478.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2229493872935538068 CanvasRenderer: @@ -66427,7 +66427,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7775140971730380409} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -69240,7 +69240,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 301.8, y: 460} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4509132478913319924 @@ -70830,8 +70830,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: 0, y: 122.73} - m_SizeDelta: {x: 221.93, y: 535.73} + m_AnchoredPosition: {x: 0, y: 58} + m_SizeDelta: {x: 221.9, y: 478.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2887791353848846137 CanvasRenderer: @@ -70848,7 +70848,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8882220962910220204} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -71581,7 +71581,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 9f24cdeec6201014a8771ad4417a383e, type: 3} + m_Sprite: {fileID: 21300000, guid: 7305dd25ffb0c7a45a745288ff547cc5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -71625,8 +71625,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: 0, y: 122.73} - m_SizeDelta: {x: 221.93, y: 535.73} + m_AnchoredPosition: {x: 0, y: 58} + m_SizeDelta: {x: 221.9, y: 478.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3078303436093781436 CanvasRenderer: @@ -71643,7 +71643,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9102668649230702127} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua index e106f681ea..71a1e65720 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua @@ -49,9 +49,9 @@ function this.SetDistinctId(distinctId) end -- 获取访客Id -function this.GetDistinctId(distinctId) +function this.GetDistinctId() if AppConst.isSDK then - return App.TAMgr:GetDistinctId(distinctId) + return App.TAMgr:GetDistinctId() end return "" end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 9651f7719d..e348ef3c63 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -695,7 +695,7 @@ function this.GetPosList() -- end local list={} for j = 1, 6 do - if data[j]==nil then + if not list[j] then table.insert(list,j) end end @@ -835,9 +835,9 @@ end function this.SetOneKeyGo() --获取需要上阵的位置 local posArr=this.GetPosList() - for i = 1, #posArr do - Log("可上阵位置索引"..posArr[i]) - end + -- for i = 1, #posArr do + -- Log("可上阵位置索引"..posArr[i]) + -- end if #posArr==0 then PopupTipPanel.ShowTip(Language[10692]) return @@ -869,6 +869,7 @@ function this.SetOneKeyGo() -- end --修改 upHeroSidTable 静态id 存储 有则跳过 local upHeroSidTable = {} + this.order = 0 this.choosedList = {} for j = 1, #this.choosedList do local curSingleherodata = HeroManager.GetSingleHeroData(this.choosedList[j].heroId) @@ -880,10 +881,10 @@ function this.SetOneKeyGo() LogGreen("this.choosedList "..#this.choosedList) if #this.choosedList < 6 then for n = 1, #posArr do - LogGreen("n posArr[n] "..n.." "..posArr[n]) upHeroSidTable[curSingleherodata.id] = curSingleherodata.id table.insert(this.choosedList, {heroId = v.dynamicId, position=posArr[n]}) table.remove(posArr,n) + this.order = this.order + 1 break end end @@ -894,7 +895,7 @@ function this.SetOneKeyGo() -- for n = 1, #posArr do -- table.insert(this.choosedList, {heroId = heros[n].dynamicId, position=posArr[n]}) -- end - this.order=this.order+#posArr + -- this.order=this.order+#posArr this.SetCardsData() this.OnClickTabBtn(proId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua index c614f52c30..dd0fc00cb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/StoryFormation.lua @@ -18,12 +18,23 @@ function this.GetFormationIndex() end --- btn1点击回调事件 function this.On_Btn2_Click() + LogRed("hadClick "..tostring(hadClick).." this.root.order "..this.root.order) if not hadClick then hadClick = true - -- 编队为空 - if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then - hadClick = false + -- -- 编队为空 + -- if #FormationManager.formationList[FormationManager.curFormationIndex].teamHeroInfos == 0 then + -- hadClick = false + -- PopupTipPanel.ShowTip(Language[10702]) + -- return + -- end + + if this.root.order>=1 then + --保存编队 + FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, + FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) + else PopupTipPanel.ShowTip(Language[10702]) + hadClick = false return end diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 5d759c7f69..b6671543b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -120,7 +120,7 @@ function this.ShowGuide(id, ...) DataCenterManager.CommitClickStatus(Language[10839], tostring(id)) ThinkingAnalyticsManager.Track("guild", { step_id = id, - guild_start_time = GetTimeStamp(), + guild_start_time = math.floor(GetTimeStamp()), }) -- 引导结束回调 local function onGuideClose() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 2a1af3ccd3..54de4ba1ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -41,7 +41,7 @@ function this.LoginRequest(openId, func) data.operator_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetOperatorName() or "" data.network_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetNetworkType() or "" data.ip_s = AppConst.isSDK and AndroidDeviceInfo.Instance:GetLocalIpAddress() or "" - data.distinct_id = AppConst.isSDK and openId or "" + 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" @@ -64,12 +64,12 @@ function this.LoginRequest(openId, func) end AppConst.Token = msg.newToken -- 打点 - ThinkingAnalyticsManager.SetDistinctId(AppConst.OpenId) + -- ThinkingAnalyticsManager.SetDistinctId(AppConst.OpenId) ThinkingAnalyticsManager.SetSuperProperties({ server_id = LoginManager.ServerId, - account = tostring(AppConst.OpenId), - ["Bundle-id"] = AppConst.SdkPackageName, - xx_id = AppConst.SdkChannel + account = AppConst.isSDK and tostring(AppConst.OpenId) or "", + ["Bundle-id"] = AppConst.isSDK and AppConst.SdkPackageName or "", + xx_id = AppConst.isSDK and AppConst.SdkChannel or "" }) TapDBManager.SetServer(LoginManager.ServerId) end) diff --git a/data_execl/base_data/ArenaRobotConfig.xlsx b/data_execl/base_data/ArenaRobotConfig.xlsx index 0821571b0d..518f7c6116 100644 Binary files a/data_execl/base_data/ArenaRobotConfig.xlsx and b/data_execl/base_data/ArenaRobotConfig.xlsx differ diff --git a/data_execl/base_data/ArenaRobotSetting.xlsx b/data_execl/base_data/ArenaRobotSetting.xlsx index e915690820..3c17496f06 100644 Binary files a/data_execl/base_data/ArenaRobotSetting.xlsx and b/data_execl/base_data/ArenaRobotSetting.xlsx differ diff --git a/data_execl/base_data/GlobalSystemConfig.xlsx b/data_execl/base_data/GlobalSystemConfig.xlsx index 3c6a515ef2..f7f93afeee 100644 Binary files a/data_execl/base_data/GlobalSystemConfig.xlsx and b/data_execl/base_data/GlobalSystemConfig.xlsx differ diff --git a/data_execl/base_data/RoleConfig.xlsx b/data_execl/base_data/RoleConfig.xlsx index d724dc99a6..63cc8ad962 100644 Binary files a/data_execl/base_data/RoleConfig.xlsx and b/data_execl/base_data/RoleConfig.xlsx differ