diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/AillieoUtils.UnityDynamicScrollView.asmdef b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/AillieoUtils.UnityDynamicScrollView.asmdef deleted file mode 100644 index 7e17a7d4f22..00000000000 --- a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/AillieoUtils.UnityDynamicScrollView.asmdef +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "AillieoUtils.UnityDynamicScrollView", - "references": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/AillieoUtils.UnityDynamicScrollView.asmdef.meta b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/AillieoUtils.UnityDynamicScrollView.asmdef.meta deleted file mode 100644 index 87b805c6782..00000000000 --- a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/AillieoUtils.UnityDynamicScrollView.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9bff4ab8c2b0f4d2780540e2780db4ce -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollView.cs.meta b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollView.cs.meta index eaad719c93b..99f6eda3cc4 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollView.cs.meta +++ b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollView.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 2d355eec575560046ba27246695b84ad -timeCreated: 1533042733 -licenseType: Free +guid: cf57b033def3f484ba56e207e7b24602 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollViewEx.cs.meta b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollViewEx.cs.meta index 036ab2ac2bf..c471e36cff1 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollViewEx.cs.meta +++ b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/ScrollViewEx.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: d8f3e076f25860743a2d5212b2c285ac -timeCreated: 1533042733 -licenseType: Free +guid: 93ae6e419a807461eae5c903f4060a95 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/SimpleObjPool.cs.meta b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/SimpleObjPool.cs.meta index 49a5e265170..c6f125ce123 100644 --- a/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/SimpleObjPool.cs.meta +++ b/ProjectNLD/Assets/Code/Scripts/Framework/ScrollView/SimpleObjPool.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 779a3e961157c3f468ebe1db83df1e8d -timeCreated: 1533284979 -licenseType: Free +guid: 05ad16b4d0f8b4c37a1cadc920b0b045 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/GamePlay.asmdef b/ProjectNLD/Assets/Code/Scripts/Gameplay/GamePlay.asmdef index e2c4d8dba65..e2a9ee9edd8 100644 --- a/ProjectNLD/Assets/Code/Scripts/Gameplay/GamePlay.asmdef +++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/GamePlay.asmdef @@ -15,8 +15,6 @@ "GUID:9069ac25d95ca17448a247f3bb1c769f", "GUID:6055be8ebefd69e48b49212b09b47b2f", "GUID:d8b63aba1907145bea998dd612889d6b", - "GUID:9bff4ab8c2b0f4d2780540e2780db4ce", - "GUID:e8e1bade9dce352419d330270edf6ddd", "GUID:df380645f10b7bc4b97d4f5eb6303d95", "GUID:029c1c1b674aaae47a6841a0b89ad80e", "GUID:bcc75752368a72b4aba4043ea13b2a1a", @@ -25,10 +23,8 @@ "GUID:84651a3751eca9349aac36a66bba901b", "GUID:f06555f75b070af458a003d92f9efb00", "GUID:0b3f64ec33f5b4da98a17367a35b82f2", - "GUID:9b1c19877f4294a9cb33ff38fc9f1c83", "GUID:0ab0f87386c0640798a09051c047d4ab", "GUID:e8754b6153389406c963cd52996cc80f", - "GUID:d9a5d47c553a04a28a7d21a3f3fc8dc3", "GUID:800597811bcc5d848b15e12807d6de45", "GUID:bcac77c69988a534c80a8944582b8784", "GUID:f0b582ec4932c478892e6a09e09a6453" diff --git a/ProjectNLD/Assets/Editor/ScrollView/AillieoUtils.UnityDynamicScrollView.Editor.asmdef b/ProjectNLD/Assets/Editor/ScrollView/AillieoUtils.UnityDynamicScrollView.Editor.asmdef deleted file mode 100644 index f85e460e5c1..00000000000 --- a/ProjectNLD/Assets/Editor/ScrollView/AillieoUtils.UnityDynamicScrollView.Editor.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "AillieoUtils.UnityDynamicScrollView.Editor", - "rootNamespace": "", - "references": [ - "AillieoUtils.UnityDynamicScrollView" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/ProjectNLD/Assets/Editor/ScrollView/AillieoUtils.UnityDynamicScrollView.Editor.asmdef.meta b/ProjectNLD/Assets/Editor/ScrollView/AillieoUtils.UnityDynamicScrollView.Editor.asmdef.meta deleted file mode 100644 index 117404054d8..00000000000 --- a/ProjectNLD/Assets/Editor/ScrollView/AillieoUtils.UnityDynamicScrollView.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 8254afa3a0c1ae84cb4f46c31dba3655 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectNLD/Assets/Editor/ScrollView/ScrollViewEditor.cs.meta b/ProjectNLD/Assets/Editor/ScrollView/ScrollViewEditor.cs.meta index f1a8a4ab2e7..125f37abf61 100644 --- a/ProjectNLD/Assets/Editor/ScrollView/ScrollViewEditor.cs.meta +++ b/ProjectNLD/Assets/Editor/ScrollView/ScrollViewEditor.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 8518bb829bc508049a52f0606b4f43a5 -timeCreated: 1533042733 -licenseType: Free +guid: e29cfb1f37b2946bab6e55856dc160cc MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/ProjectNLD/Assets/Editor/ScrollView/ScrollViewExEditor.cs.meta b/ProjectNLD/Assets/Editor/ScrollView/ScrollViewExEditor.cs.meta index fb49268d0cb..ad18ceeccd7 100644 --- a/ProjectNLD/Assets/Editor/ScrollView/ScrollViewExEditor.cs.meta +++ b/ProjectNLD/Assets/Editor/ScrollView/ScrollViewExEditor.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 12cd1055a4162f842842a60918857100 -timeCreated: 1533042733 -licenseType: Free +guid: 8712942f108f8440f8c2e28a682b7982 MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/ProjectNLD/Assets/PhxhSDK b/ProjectNLD/Assets/PhxhSDK index 4a52b75ef98..5e8020b4e86 160000 --- a/ProjectNLD/Assets/PhxhSDK +++ b/ProjectNLD/Assets/PhxhSDK @@ -1 +1 @@ -Subproject commit 4a52b75ef981110d0f470c24a75047182ae5c129 +Subproject commit 5e8020b4e864676f7718b32025fbb0a5d5043737 diff --git a/ProjectNLD/Packages/manifest.json b/ProjectNLD/Packages/manifest.json index 75faa8c9764..8dff7072ce6 100644 --- a/ProjectNLD/Packages/manifest.json +++ b/ProjectNLD/Packages/manifest.json @@ -2,6 +2,11 @@ "dependencies": { "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git", "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", + "com.taptap.tds.login":"https://github.com/TapTap/TapLogin-Unity.git#3.23.0", + "com.taptap.tds.common":"https://github.com/TapTap/TapCommon-Unity.git#3.23.0", + "com.taptap.tds.bootstrap":"https://github.com/TapTap/TapBootstrap-Unity.git#3.23.0", + "com.leancloud.realtime":"https://github.com/leancloud/csharp-sdk-upm.git#realtime-1.0.2", + "com.leancloud.storage":"https://github.com/leancloud/csharp-sdk-upm.git#storage-1.0.2", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.addressables": "1.21.18", diff --git a/ProjectNLD/Packages/packages-lock.json b/ProjectNLD/Packages/packages-lock.json index 0805c15d470..12d589c39db 100644 --- a/ProjectNLD/Packages/packages-lock.json +++ b/ProjectNLD/Packages/packages-lock.json @@ -14,6 +14,53 @@ "dependencies": {}, "hash": "cfe509a55602ba5be6df7fa0468b10298b8a053d" }, + "com.leancloud.realtime": { + "version": "https://github.com/leancloud/csharp-sdk-upm.git#realtime-1.0.2", + "depth": 0, + "source": "git", + "dependencies": { + "com.leancloud.storage": "https://github.com/leancloud/csharp-sdk-upm.git#storage-1.0.2" + }, + "hash": "73c70db9d89e6115776b05badb8239b655a5d212" + }, + "com.leancloud.storage": { + "version": "https://github.com/leancloud/csharp-sdk-upm.git#storage-1.0.2", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "beef2954fb0dbe2471952c34a32a5885a427ce9a" + }, + "com.taptap.tds.bootstrap": { + "version": "https://github.com/TapTap/TapBootstrap-Unity.git#3.23.0", + "depth": 0, + "source": "git", + "dependencies": { + "com.taptap.tds.common": "https://github.com/TapTap/TapCommon-Unity.git#3.23.0", + "com.taptap.tds.login": "https://github.com/TapTap/TapLogin-Unity.git#3.23.0", + "com.leancloud.realtime": "https://github.com/leancloud/csharp-sdk-upm.git#realtime-0.10.14", + "com.leancloud.storage": "https://github.com/leancloud/csharp-sdk-upm.git#storage-0.10.14" + }, + "hash": "6b25a2d15293009dc2f50db283f42b498eea38c6" + }, + "com.taptap.tds.common": { + "version": "https://github.com/TapTap/TapCommon-Unity.git#3.23.0", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.leancloud.storage": "https://github.com/leancloud/csharp-sdk-upm.git#storage-0.10.14" + }, + "hash": "2d74f084c3a318d946da76e91cbc9b8255e0a864" + }, + "com.taptap.tds.login": { + "version": "https://github.com/TapTap/TapLogin-Unity.git#3.23.0", + "depth": 0, + "source": "git", + "dependencies": { + "com.taptap.tds.common": "https://github.com/TapTap/TapCommon-Unity.git#3.23.0" + }, + "hash": "82574596a23f20dc0ee537644c8d7b3676c14a55" + }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0,