Assets/Art
@@ -1 +1 @@ Subproject commit 5eb323db8f53e10d692116f2a01da2812259a731 Subproject commit 8d2b2a8e8f55c649f60fa49c29d69aa954ffd65b Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
@@ -332,7 +332,7 @@ uiroot = GameObject.FindObjectOfType<UIRoot>(); if (uiroot == null) { var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot"); var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot"); var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity); root.name = "UIRoot"; uiroot = root.GetComponent<UIRoot>(); Assets/Editor/Tool/BuildExtersion.cs
@@ -211,6 +211,7 @@ BuiltInResourceSetting.SetLaunchBackGround(publisher, buildParameters.buildTarget); BuiltInResourceSetting.SetLoginBackGround(publisher, buildParameters.buildTarget); BuiltInResourceSetting.SetLoginLogo(publisher, buildParameters.buildTarget); UpdateBuiltInSetting.SetAllLuaAssetBundleName(); ExcuteBuildAsset("builtin", buildParameters); } else Assets/Editor/Tool/PrefabCreateTool.cs
@@ -56,7 +56,7 @@ var uiroot = GameObject.FindObjectOfType<UIRoot>(); if (uiroot == null) { var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot"); var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot"); var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity); root.name = "UIRoot"; uiroot = root.GetComponent<UIRoot>(); @@ -90,7 +90,7 @@ var uiroot = GameObject.FindObjectOfType<UIRoot>(); if (uiroot == null) { var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot"); var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot"); var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity); root.name = "UIRoot"; uiroot = root.GetComponent<UIRoot>(); @@ -124,7 +124,7 @@ var uiroot = GameObject.FindObjectOfType<UIRoot>(); if (uiroot == null) { var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot"); var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot"); var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity); root.name = "UIRoot"; uiroot = root.GetComponent<UIRoot>(); @@ -159,7 +159,7 @@ var uiroot = GameObject.FindObjectOfType<UIRoot>(); if (uiroot == null) { var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot"); var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot"); var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity); root.name = "UIRoot"; uiroot = root.GetComponent<UIRoot>(); Assets/Editor/Tool/UpdateAssetBundleName.cs
@@ -268,4 +268,38 @@ AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); } } public class UpdateBuiltInSetting { static string rootPath = Application.dataPath + "/ResourcesOut/BuiltIn/"; static string assetPath = "Assets/ResourcesOut/BuiltIn/"; [MenuItem("程序/设置资源包名/更新BuiltIn(All) AssetBundleName")] public static void SetAllLuaAssetBundleName() { var allFiles = new List<FileInfo>(); FileExtersion.GetAllDirectoryFileInfos(rootPath, allFiles); var amendRootPath = rootPath.Replace("\\", "/"); foreach (var file in allFiles) { var extension = Path.GetExtension(file.FullName); if (extension == ".meta") { continue; } var directoryName = file.DirectoryName.Replace("\\", "/"); var relativeDirectory = directoryName.Replace(amendRootPath, ""); var importerPath = assetPath + relativeDirectory + Path.DirectorySeparatorChar + file.Name; var importer = AssetImporter.GetAtPath(importerPath); importer.assetBundleName = "builtin/" + relativeDirectory.ToLower(); EditorUtility.SetDirty(importer); } AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); } } Assets/Plugins/Demigiant/DOTweenSettings.asset
Assets/Plugins/Demigiant/DOTweenSettings.asset.meta
Assets/Resources/AnimationCurve.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_DeadFly.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_DeadFly.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_HurtFlash.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_HurtFlash.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Shake.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Shake.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_1_X.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_1_X.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_1_Y.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_1_Y.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_1_Z.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_1_Z.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_2_X.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_2_X.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_2_Y.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_2_Y.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_2_Z.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Transfer_2_Z.asset.meta
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Zoom.asset
File was deleted Assets/Resources/AnimationCurve/Anim_Curve_Zoom.asset.meta
File was deleted Assets/Resources/AnimationCurve/Map000_kaishir.anim
File was deleted Assets/Resources/AnimationCurve/Map000_kaishir.anim.meta
File was deleted Assets/Resources/AudioMixer.meta
File was deleted Assets/Resources/AudioMixer/Master_AudioMixer.mixer
File was deleted Assets/Resources/AudioMixer/Master_AudioMixer.mixer.meta
File was deleted Assets/Resources/Config.meta
File was deleted Assets/Resources/Config/Contact.txt
File was deleted Assets/Resources/Config/Contact.txt.meta
File was deleted Assets/Resources/Config/HelpInfo.txt
File was deleted Assets/Resources/Config/HelpInfo.txt.meta
File was deleted Assets/Resources/Config/PriorBundle.txt
File was deleted Assets/Resources/Config/PriorBundle.txt.meta
File was deleted Assets/Resources/Config/PriorLanguage.txt
File was deleted Assets/Resources/Config/PriorLanguage.txt.meta
File was deleted Assets/Resources/Material.meta
File was deleted Assets/Resources/Material/DailyQuestWinFlash.mat
File was deleted Assets/Resources/Material/DailyQuestWinFlash.mat.meta
File was deleted Assets/Resources/Material/FightBlackMask.mat
File was deleted Assets/Resources/Material/FightBlackMask.mat.meta
File was deleted Assets/Resources/Material/Flash.mat
File was deleted Assets/Resources/Material/Flash.mat.meta
File was deleted Assets/Resources/Material/HUD_HeadupName.mat
File was deleted Assets/Resources/Material/HUD_HeadupName.mat.meta
File was deleted Assets/Resources/Material/HardShadowProjector.mat
File was deleted Assets/Resources/Material/HardShadowProjector.mat.meta
File was deleted Assets/Resources/Material/ImageMask.mat
File was deleted Assets/Resources/Material/ImageMask.mat.meta
File was deleted Assets/Resources/Material/LOGO.mat
File was deleted Assets/Resources/Material/LOGO.mat.meta
File was deleted Assets/Resources/Material/ShadowReceiver.mat
File was deleted Assets/Resources/Material/ShadowReceiver.mat.meta
File was deleted Assets/Resources/Material/SmoothMaskGray.mat
File was deleted Assets/Resources/Material/SmoothMaskGray.mat.meta
File was deleted Assets/Resources/Material/SpriteGray.mat
File was deleted Assets/Resources/Material/SpriteGray.mat.meta
File was deleted Assets/Resources/Material/TextFill.mat
File was deleted Assets/Resources/Material/TextFill.mat.meta
File was deleted Assets/Resources/Material/TextMask.mat
File was deleted Assets/Resources/Material/TextMask.mat.meta
File was deleted Assets/Resources/Material/TreasureSky.mat
File was deleted Assets/Resources/Material/TreasureSky.mat.meta
File was deleted Assets/Resources/Material/UI_RenderTexture.mat
File was deleted Assets/Resources/Material/UI_RenderTexture.mat.meta
File was deleted Assets/Resources/Material/XRay.mat
File was deleted Assets/Resources/Material/XRay.mat.meta
File was deleted Assets/Resources/Prefabs.meta
File was deleted Assets/Resources/Prefabs/ActorShadowCaster.prefab
File was deleted Assets/Resources/Prefabs/ActorShadowCaster.prefab.meta
File was deleted Assets/Resources/Prefabs/AudioSource3D.prefab
File was deleted Assets/Resources/Prefabs/AudioSource3D.prefab.meta
File was deleted Assets/Resources/Prefabs/GameCamera.prefab
File was deleted Assets/Resources/Prefabs/GameCamera.prefab.meta
File was deleted Assets/Resources/Prefabs/SoundPlayer.prefab
File was deleted Assets/Resources/Prefabs/SoundPlayer.prefab.meta
File was deleted Assets/Resources/Prefabs/Zhujiao_Pointlight.prefab
File was deleted Assets/Resources/Prefabs/Zhujiao_Pointlight.prefab.meta
File was deleted Assets/Resources/ScriptableObject.meta
File was deleted Assets/Resources/ScriptableObject/Config.meta
File was deleted Assets/Resources/ScriptableObject/Config/EarlyStageFirstWaveRock.asset
File was deleted Assets/Resources/ScriptableObject/Config/EarlyStageFirstWaveRock.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/EnableButton_Default.asset
File was deleted Assets/Resources/ScriptableObject/Config/EnableButton_Default.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPersonalBossLevel.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPersonalBossLevel.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPersonalBossName.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPersonalBossName.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPreciousBossLevel.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPreciousBossLevel.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPreciousBossName.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_FindPreciousBossName.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_KirinFloor.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_KirinFloor.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_KirinSelectBar.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_KirinSelectBar.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_LocalMapToggle.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_LocalMapToggle.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_MainWinAhievement.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_MainWinAhievement.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_ServerListToggle.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_ServerListToggle.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_TeamMemberLocation.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_TeamMemberLocation.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_TeamMission.asset
File was deleted Assets/Resources/ScriptableObject/Config/FontColorSize_TeamMission.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Default.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Default.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity1.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity1.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_OpenServerActivity2.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Task.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Task.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_TeamFrame.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_TeamFrame.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_TreasureCategory.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_TreasureCategory.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_TreasureDetails.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_TreasureDetails.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_UnionMatch.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_UnionMatch.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Version4.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Version4.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Version5.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Version5.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Vip .asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Vip .asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Welfare.asset
File was deleted Assets/Resources/ScriptableObject/Config/FunctionButton_Welfare.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/PriorityWindowConfig.asset
File was deleted Assets/Resources/ScriptableObject/Config/PriorityWindowConfig.asset.meta
File was deleted Assets/Resources/ScriptableObject/Config/WindowPosConfig.asset
File was deleted Assets/Resources/ScriptableObject/Config/WindowPosConfig.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves.meta
File was deleted Assets/Resources/ScriptableObject/Curves/BrokenLine1.asset
File was deleted Assets/Resources/ScriptableObject/Curves/BrokenLine1.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/BrokenLine2.asset
File was deleted Assets/Resources/ScriptableObject/Curves/BrokenLine2.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/EaseInOut.asset
File was deleted Assets/Resources/ScriptableObject/Curves/EaseInOut.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/FairyCallMember.asset
File was deleted Assets/Resources/ScriptableObject/Curves/FairyCallMember.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/GodWeapon.asset
File was deleted Assets/Resources/ScriptableObject/Curves/GodWeapon.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Grade1.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Grade1.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Grade2.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Grade2.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Horizontal.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Horizontal.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/HorizontalHIT.asset
File was deleted Assets/Resources/ScriptableObject/Curves/HorizontalHIT.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Horizontal_JS.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Horizontal_JS.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Horizontal_UP.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Horizontal_UP.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Linear.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Linear.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Linear1.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Linear1.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/NewRecordShake.asset
File was deleted Assets/Resources/ScriptableObject/Curves/NewRecordShake.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/PopupNum.asset
File was deleted Assets/Resources/ScriptableObject/Curves/PopupNum.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/PopupNum1.asset
File was deleted Assets/Resources/ScriptableObject/Curves/PopupNum1.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/ServerTipScale.asset
File was deleted Assets/Resources/ScriptableObject/Curves/ServerTipScale.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/TimeCoolDown.asset
File was deleted Assets/Resources/ScriptableObject/Curves/TimeCoolDown.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/TreasurePrivilegePop.asset
File was deleted Assets/Resources/ScriptableObject/Curves/TreasurePrivilegePop.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/TreasureSoul.asset
File was deleted Assets/Resources/ScriptableObject/Curves/TreasureSoul.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/TreasureStagePop.asset
File was deleted Assets/Resources/ScriptableObject/Curves/TreasureStagePop.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/TreasureUnFlodAlpha.asset
File was deleted Assets/Resources/ScriptableObject/Curves/TreasureUnFlodAlpha.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/Upgrade.asset
File was deleted Assets/Resources/ScriptableObject/Curves/Upgrade.asset.meta
File was deleted Assets/Resources/ScriptableObject/Curves/WishingHandLine.asset
File was deleted Assets/Resources/ScriptableObject/Curves/WishingHandLine.asset.meta
File was deleted Assets/Resources/ScriptableObject/PostProcessing.meta
File was deleted Assets/Resources/ScriptableObject/PostProcessing/SceneCamera.asset
File was deleted Assets/Resources/ScriptableObject/PostProcessing/SceneCamera.asset.meta
File was deleted Assets/Resources/ScriptableObject/PostProcessing/TreasureDetailsCamera.asset
File was deleted Assets/Resources/ScriptableObject/PostProcessing/TreasureDetailsCamera.asset.meta
File was deleted Assets/Resources/ScriptableObject/PostProcessing/TreasureListCamera.asset
File was deleted Assets/Resources/ScriptableObject/PostProcessing/TreasureListCamera.asset.meta
File was deleted Assets/Resources/ScriptableObject/PostProcessing/UICamera.asset
File was deleted Assets/Resources/ScriptableObject/PostProcessing/UICamera.asset.meta
File was deleted Assets/Resources/Square.pngBinary files differ
Assets/Resources/Square.png.meta
File was deleted Assets/Resources/VersionConfig.asset
File was renamed from Assets/Resources/ScriptableObject/Config/VersionConfig.asset @@ -12,6 +12,7 @@ m_Name: VersionConfig m_EditorClassIdentifier: m_AppId: test m_SpID: m_VersionAuthority: 0 m_Version: 10.1000.1 m_ClientPackageFlag: aaa @@ -30,3 +31,4 @@ m_BuildTime: 18/08/06--16:39 m_BuildIndex: 100 m_LogoPosition: {x: -15, y: 64} m_BanHao: Assets/Resources/VersionConfig.asset.meta
Assets/ResourcesOut
@@ -1 +1 @@ Subproject commit 84c5df95c94f18dfcdfb4fcb12216f17f4106e8e Subproject commit 266a7013549b6b2d5bf2f62962f627b6028a68b6 Assets/Scripts
@@ -1 +1 @@ Subproject commit 5d3c81b6bee461e078f5bcf15f3dbb0b83fb6966 Subproject commit 9fabf247914adc5f93926644798a8cd543c73193
