wuyu il y a 1 an
Parent
commit
fce3c88321

+ 3 - 0
Assembly-CSharp-Editor.csproj

@@ -51,6 +51,7 @@
      <Compile Include="Assets/_Packages/PaperFoldAsset/DecalToTexture/Scripts/Editor/DecalMasterEditor.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/GDPR Panel/_Scripts/Editor/GDPREditor.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/Scripts/Editor/Tools.cs" />
+     <Compile Include="Assets/Tools/Editor/CleanTools/CleanTools.cs" />
      <None Include="Assets/_Packages/PaperFoldAsset/ExternalDependencyManager/Editor/GoogleRegistries.xml" />
      <Folder Include="Assets/EikoYandex/Editor/Scripts" />
      <Folder Include="Assets/EikoYandex/Editor" />
@@ -58,10 +59,12 @@
      <Folder Include="Assets/EikoYandex/Editor/Resources/YaSDKUI" />
      <Folder Include="Assets/EikoYandex/Editor/Prefabs" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/ExternalDependencyManager/Editor" />
+     <Folder Include="Assets/Tools/Editor/CleanTools" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/GDPR Panel/_Scripts/Editor" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Editor" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/Scripts/Editor" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/Paper Fold/Scripts/Editor" />
+     <Folder Include="Assets/Tools/Editor" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/UIGradient/Editor" />
      <Folder Include="Assets/EikoYandex/Editor/Resources" />
      <Folder Include="Assets/Editor" />

+ 3 - 0
Assembly-CSharp.csproj

@@ -170,6 +170,7 @@
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Scripts/GeneralBasic.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Archived/TestingRigidbodyCS.cs" />
      <Compile Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetUI/LeanTween/Examples/Scripts/Following.cs" />
+     <Compile Include="Assets/PaperFold/Test/TestLevel.cs" />
      <Folder Include="Assets" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Environment/Water/Other" />
      <Folder Include="Assets/_Packages/GUI Mobile Hyper-Casual/Sprites/Items PSD + PNG/Gun" />
@@ -192,12 +193,14 @@
      <Folder Include="Assets/_Packages/PaperFoldAsset/DecalToTexture" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetParticles/Ambient Particle Systems/Materials" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Interactive/Hearts" />
+     <Folder Include="Assets/PaperFold/Test" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Interactive/Loot/ChestAppear" />
      <None Include="Assets/Epic Toon FX/Prefabs/Environment/Environment FX.txt" />
      <Folder Include="Assets/_Packages/GUI Mobile Hyper-Casual/Sprites/Sprites by Menu/Win-assets" />
      <Folder Include="Assets/_Packages/PaperFoldAsset/JetSystems/JetParticles/Ambient Particle Systems" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Environment/Fire/Cartoon/Torch Intense" />
      <Folder Include="Assets/Epic Toon FX/Demo/Scripts/VFX Library" />
+     <Folder Include="Assets/Tools" />
      <Folder Include="Assets/_Prefabs/AdditionalPepers/Medium/Trapeze" />
      <Folder Include="Assets/Epic Toon FX/Materials/Misc/Skulls" />
      <Folder Include="Assets/Epic Toon FX/Prefabs/Interactive/Loot" />

+ 9 - 1
Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset

@@ -16,7 +16,15 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: d8c17abaa8f35c242897e1cc58d321e9
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: 5e4dc6113d8c6f949b0aef6342483290
+    m_Address: Assets/Resources/PaperFold/Prefabs/Level1.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: e6082aa80468eeb45a02d16959d74272
+    m_Address: Assets/Resources/PaperFold/Prefabs/Level2.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: c52a1433758912642bab74b36240d360, type: 2}
   m_SchemaSet:

+ 49 - 1
Assets/PaperFold/Scene/GameScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657838, g: 0.49641234, b: 0.57481676, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -216,6 +216,54 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &359552715
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 359552717}
+  - component: {fileID: 359552716}
+  m_Layer: 0
+  m_Name: Test
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &359552716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 359552715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 927666d71d09d46fe891bfbf3f4248cf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  papers:
+    m_AssetGUID: 5e4dc6113d8c6f949b0aef6342483290
+    m_SubObjectName: 
+    m_SubObjectType: 
+    m_EditorAssetChanged: 0
+--- !u!4 &359552717
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 359552715}
+  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!1 &1506158843
 GameObject:
   m_ObjectHideFlags: 0

Assets/_Scenes/Gameplay.unity → Assets/PaperFold/Scene/Gameplay.unity


Assets/_Scenes/Gameplay.unity.meta → Assets/PaperFold/Scene/Gameplay.unity.meta


+ 8 - 0
Assets/PaperFold/Test.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 507fda47f1ed241bdbbae5f762376ebe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 32 - 0
Assets/PaperFold/Test/TestLevel.cs

@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+public class TestLevel : MonoBehaviour
+{
+    [SerializeField] private AssetReference papers;
+    private Paper currentPaper;
+    async void  Start()
+    {
+       await this.SpawnLevel();
+    }
+
+    // Update is called once per frame
+    public async UniTask SpawnLevel()
+    {
+        Paper levelPrefab = await LoadPaperLevel(0);
+        currentPaper = Instantiate(levelPrefab, transform);
+    }
+
+    private async UniTask<Paper> LoadPaperLevel(int level)
+    {
+        GameObject paperGameObject = null;
+        if (papers.Asset is GameObject)
+            paperGameObject = papers.Asset as GameObject;
+
+
+        return paperGameObject.GetComponent<Paper>();
+    }
+}

+ 11 - 0
Assets/PaperFold/Test/TestLevel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 927666d71d09d46fe891bfbf3f4248cf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Tools.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 80bf685848da844dca4b6f4a31b3163b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Tools/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec4bd8439d61e4a1eb2aec0a0b2aa3e4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/Tools/Editor/CleanTools.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 78cf506fe07a446c3bf001306d52da90
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 47 - 0
Assets/Tools/Editor/CleanTools/CleanTools.cs

@@ -0,0 +1,47 @@
+using System.IO;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+
+public class CleanTools
+{
+    [MenuItem("清理工具/清除本地数据")]
+    public static void CleanLocalData()
+    {
+        PlayerPrefs.DeleteAll();
+        var localPath = Application.persistentDataPath;
+        Debug.Log("正在清理-->" + localPath);
+        PlayerPrefs.DeleteAll();
+        if (Directory.Exists(localPath)) DelectDir(localPath);
+    }
+
+    public static void DelectDir(string srcPath)
+    {
+        var dir = new DirectoryInfo(srcPath);
+        var fileinfo = dir.GetFileSystemInfos(); //返回目录中所有文件和子目录
+        foreach (var i in fileinfo)
+            if (i is DirectoryInfo) //判断是否文件夹
+            {
+                var subdir = new DirectoryInfo(i.FullName);
+                subdir.Delete(true); //删除子目录和文件
+            }
+            else
+            {
+                File.Delete(i.FullName); //删除指定文件
+            }
+
+        dir.Delete();
+    }
+
+    [MenuItem("场景工具/进入Init")]
+    public static void GoToInit()
+    {
+        EditorSceneManager.OpenScene("Packages/com.game.common/Runtime/Scenes/Init.unity", OpenSceneMode.Single);
+    }
+
+    [MenuItem("场景工具/进入Splash")]
+    public static void GoToSplash()
+    {
+        EditorSceneManager.OpenScene("Assets/Scenes/Splash.unity", OpenSceneMode.Single);
+    }
+}

+ 11 - 0
Assets/Tools/Editor/CleanTools/CleanTools.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d64ae44eceec144519ad0ac980e49cde
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
ProjectSettings/EditorBuildSettings.asset

@@ -9,7 +9,7 @@ EditorBuildSettings:
     path: Assets/_Scenes/Preloader.unity
     guid: 33d5ab03568755d4395135409bcdce4f
   - enabled: 1
-    path: Assets/_Scenes/Gameplay.unity
+    path: Assets/PaperFold/Scene/Gameplay.unity
     guid: 20dd3d27b8c961a4bb13c0908206d5c2
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: e52af7fd5fb502a48be0fff686244d38, type: 2}

+ 6 - 3
UserSettings/EditorUserSettings.asset

@@ -12,13 +12,16 @@ EditorUserSettings:
       value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077c6e235e8eb0e30083c1afb29163b4e0cf10f070ee5443a0a010bef4e3cfe1b16038b0dcb13dc06
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241800e1e53a3dacf238e0f323
+      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077d2e626ecf57a19333506a00f073b0f3ae145240aff05441e1f07e917
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646643d0f0f2911245a035927193a293a003f212d3c20f1e52077d2e626ecf57a19333506a00f073b0f3ae145240aff05441e1f07e917
+      value: 22424703114646643e0d092c15301037171a1d3a20293f7e38271427fb
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646643e0d092c15301037171a1d3a20293f7e38271427fb
+      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241800e1e53a3dacf238e0f323
+      flags: 0
+    RecentlyUsedScenePath-5:
+      value: 224247031146466b0c1e0930362c531459241b2f222d69172c241823eee12d76f7e93ffdfe
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650