diff --git a/Assets/LuaFramework/Scenes/Logo.unity b/Assets/LuaFramework/Scenes/Logo.unity index 1152dd556b..1f4469435d 100644 --- a/Assets/LuaFramework/Scenes/Logo.unity +++ b/Assets/LuaFramework/Scenes/Logo.unity @@ -280,83 +280,3 @@ MonoBehaviour: isSDKLogin: 0 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: c5c1615b7c3741fbacbcc3cc8fd751e9 - serverUrl: https://osbigdata.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: b9hrb9imz2ztwbjx - channel: "TCX-\u65B0\u9A6C\u6FB3-\u5B89\u5353" ---- !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: 210ba9e97f diff --git a/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieab.mat b/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieab.mat index bc52a6869d..6c274c20e2 100644 --- a/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieab.mat +++ b/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieab.mat @@ -92,7 +92,7 @@ Material: - _V_Speed: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1.3018868, g: 0.46255845, b: 0, a: 1} + - _Color: {r: 1.5578706, g: 0.081563905, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1} - _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1} diff --git a/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieadd.mat b/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieadd.mat index 124d76b218..0d4e044207 100644 --- a/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieadd.mat +++ b/Assets/ManagedResources/EffectResUI/Recruit/Materials/fx_shiyuanzheng_renjieadd.mat @@ -90,7 +90,7 @@ Material: - _V_Speed: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 2.1960785, g: 1.4117647, b: 0, a: 1} + - _Color: {r: 3.7079175, g: 0.830419, b: 0.3862414, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1} - _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1} diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab index 963e1b4383..d20530547d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab @@ -89275,7 +89275,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &330542457203313933 RectTransform: m_ObjectHideFlags: 0 @@ -89296,7 +89296,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 108, y: -803.6999} + m_AnchoredPosition: {x: -10908, y: -433} m_SizeDelta: {x: 216, y: 1607.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &268591455508645806 @@ -99498,6 +99498,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6475993147429816923} m_Modifications: + - target: {fileID: 6944746469100342163, guid: b327a158e0efcce46b4945da7ef2314c, + type: 3} + propertyPath: m_Name + value: fx_shiyuanzheng_diban + objectReference: {fileID: 0} - target: {fileID: 6944746469100342162, guid: b327a158e0efcce46b4945da7ef2314c, type: 3} propertyPath: m_LocalPosition.x @@ -99553,11 +99558,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6944746469100342163, guid: b327a158e0efcce46b4945da7ef2314c, - type: 3} - propertyPath: m_Name - value: fx_shiyuanzheng_diban - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b327a158e0efcce46b4945da7ef2314c, type: 3} --- !u!4 &1890831281 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 140a296b26..6244eb37cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -5761,7 +5761,7 @@ local passivityList = { if BattleLogic.GetCurRound() ~= round then return end - if defRole and defRole.camp~=role.camp and skill.owner==role and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra) then + if defRole and defRole.camp~=role.camp and skill and skill.owner==role and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra) then BattleUtil.RandomAction(pro, function() BattleLogic.BuffMgr:ClearBuff(defRole, function(buff) --之前写的 buff.immuneType == 2 不知道为什么清除免疫燃烧 改成==1 了 by:王振兴 2021/06/09 diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua index 86376e06e4..afa08336dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua @@ -464,6 +464,7 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill) for i, v in ipairs(_msgHeroData.soulPos) do local soulPrint = { equipId = v.equipId, position = v.position } table.insert(soulPrintList, soulPrint) + heroData.actionPower = heroData.actionPower + equipConfig[v.equipId].Score end heroData.soulPrintList = soulPrintList end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua index 0e5daa5518..ef2a4b0998 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua @@ -48,7 +48,7 @@ function GuildFindPopup:BindEvent() local name = this.input.text if name == "" then this.input.text = "" - this.RefreshRecommandList() + this.RefreshRecommandList(true,true) PopupTipPanel.ShowTip(Language[10879]) return end @@ -175,9 +175,10 @@ function this.CloseSelf() end -- 刷新推荐列表 -function this.RefreshRecommandList() +function this.RefreshRecommandList(isTop,isAnim) + GuildManager.RecommandGuildList = {} GuildManager.RequestRecommandGuildList(this.curPage,function() - this.SetListType(1) + this.SetListType(1,isTop,isAnim) end) end @@ -293,6 +294,7 @@ end --界面关闭时调用(用于子类重写) function GuildFindPopup:OnClose() -- 控制挂机界面伤害文字显示 + GuildManager.RecommandGuildList = {} FightPointPassManager.isBeginFight = false end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua index 6d72d48abf..8274b5783c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua @@ -11,11 +11,17 @@ end -- 请求推荐公会列表 function GuildManager.RequestRecommandGuildList(page,func) + this.RecommandGuildList = {} NetManager.RequestRecommandGuild(page,function(msg) local len = #this.RecommandGuildList for i, info in ipairs(msg.familyRecomandInfo) do this.RecommandGuildList[len+i] = info end + if #msg.familyRecomandInfo < 10 then + this.MaxNumber = true + else + this.MaxNumber = false + end if func then func() end end) end diff --git a/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs b/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs index fff8bbca01..2964ad09c6 100644 --- a/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs +++ b/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs @@ -33,6 +33,9 @@ using UnityEngine; using UnityEditor; using UnityEditor.Callbacks; #endif +#if UNITY_IOS +using UnityEditor.iOS.Xcode; +#endif using System.IO; using ThinkingAnalytics.TaException; @@ -196,7 +199,7 @@ namespace ThinkingAnalytics public class ThinkingAnalyticsAPI : MonoBehaviour, TaExceptionHandler { - #region settings +#region settings [System.Serializable] public struct Token { @@ -275,61 +278,63 @@ namespace ThinkingAnalytics [HideInInspector] public Token[] tokens = new Token[1]; - #endregion +#endregion public readonly string VERSION = "2.2.1"; private static ThinkingAnalyticsAPI taAPIInstance; //配置Xcode选项 - #if UNITY_EDITOR +#if UNITY_EDITOR //[PostProcessBuild] [PostProcessBuildAttribute(88)] public static void onPostProcessBuild(BuildTarget target, string targetPath) - { - //if (target != BuildTarget.iOS) - //{ - // Debug.LogWarning("Target is not iPhone. XCodePostProcess will not run"); - // return; - //} - - //string projPath = Path.GetFullPath(targetPath) + "/Unity-iPhone.xcodeproj/project.pbxproj"; + { +#if EDITOR_IOS + if (target != BuildTarget.iOS) + { + Debug.LogWarning("Target is not iPhone. XCodePostProcess will not run"); + return; + } - //UnityEditor.iOS.Xcode.PBXProject proj = new UnityEditor.iOS.Xcode.PBXProject(); - //proj.ReadFromFile(projPath); - //#if UNITY_2019_3_OR_NEWER - //string targetGuid = proj.GetUnityFrameworkTargetGuid(); - //#else - //string targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName()); - //#endif + string projPath = Path.GetFullPath(targetPath) + "/Unity-iPhone.xcodeproj/project.pbxproj"; - ////Build Property - //proj.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");//BitCode NO - //proj.SetBuildProperty(targetGuid, "GCC_ENABLE_OBJC_EXCEPTIONS", "YES");//Enable Objective-C Exceptions + UnityEditor.iOS.Xcode.PBXProject proj = new UnityEditor.iOS.Xcode.PBXProject(); + proj.ReadFromFile(projPath); +#if UNITY_2019_3_OR_NEWER + string targetGuid = proj.GetUnityFrameworkTargetGuid(); +#else + string targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName()); +#endif - //string[] headerSearchPathsToAdd = { "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/main", "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/common" }; - //proj.UpdateBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", headerSearchPathsToAdd, null);// Header Search Paths + //Build Property + proj.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");//BitCode NO + proj.SetBuildProperty(targetGuid, "GCC_ENABLE_OBJC_EXCEPTIONS", "YES");//Enable Objective-C Exceptions - ////Add Frameworks - //proj.AddFrameworkToProject(targetGuid,"WebKit.framework", true); - //proj.AddFrameworkToProject(targetGuid,"CoreTelephony.framework", true); - //proj.AddFrameworkToProject(targetGuid,"SystemConfiguration.framework", true); - //proj.AddFrameworkToProject(targetGuid,"Security.framework", true); + string[] headerSearchPathsToAdd = { "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/main", "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/common" }; + proj.UpdateBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", headerSearchPathsToAdd, null);// Header Search Paths - ////Add Lib - //proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libsqlite3.tbd", "libsqlite3.tbd", PBXSourceTree.Sdk)); - //proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libz.tbd", "libz.tbd", PBXSourceTree.Sdk)); + //Add Frameworks + proj.AddFrameworkToProject(targetGuid, "WebKit.framework", true); + proj.AddFrameworkToProject(targetGuid, "CoreTelephony.framework", true); + proj.AddFrameworkToProject(targetGuid, "SystemConfiguration.framework", true); + proj.AddFrameworkToProject(targetGuid, "Security.framework", true); - //proj.WriteToFile (projPath); + //Add Lib + proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libsqlite3.tbd", "libsqlite3.tbd", PBXSourceTree.Sdk)); + proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libz.tbd", "libz.tbd", PBXSourceTree.Sdk)); + + proj.WriteToFile(projPath); +#endif } - #endif +#endif - /// - /// 设置自定义访客 ID,用于替换系统生成的访客 ID - /// - /// 访客 ID - /// 项目 ID(可选) - public static void Identify(string FIRSTId, string appId = "") + /// + /// 设置自定义访客 ID,用于替换系统生成的访客 ID + /// + /// 访客 ID + /// 项目 ID(可选) + public static void Identify(string FIRSTId, string appId = "") { if (tracking_enabled) { @@ -877,14 +882,14 @@ namespace ThinkingAnalytics } } - #region internal +#region internal void Awake() { taAPIInstance = this; - #if DISABLE_TA +#if DISABLE_TA tracking_enabled = false; - #endif +#endif TD_Log.EnableLog(enableLog); ThinkingAnalyticsWrapper.SetVersionInfo(VERSION); if (TA_instance == null) @@ -959,6 +964,6 @@ namespace ThinkingAnalytics instance_lock.ExitReadLock(); } } - #endregion +#endregion } }