Pull request #9: Corriger merge conflict causé par le merge de GestionResource
Merge in CGD/gather-and-defend from maintenance/textmeshproAssemblyImport to main * commit '5d9f4d5a964894c5619e979c73065b69cd57f371': Ajout de Unity.TestMeshPro au GameAssembly
This commit is contained in:
commit
4c2ad3dbd2
@ -1,3 +1,16 @@
|
||||
{
|
||||
"name": "GameAssembly"
|
||||
"name": "GameAssembly",
|
||||
"rootNamespace": "",
|
||||
"references": [
|
||||
"GUID:6055be8ebefd69e48b49212b09b47b2f"
|
||||
],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"overrideReferences": false,
|
||||
"precompiledReferences": [],
|
||||
"autoReferenced": true,
|
||||
"defineConstraints": [],
|
||||
"versionDefines": [],
|
||||
"noEngineReferences": false
|
||||
}
|
||||
8
Assets/Scripts/Resource.meta
Normal file
8
Assets/Scripts/Resource.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 55c55d07c4a6c4240859bbbbde7b9a3c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +1,6 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UIElements;
|
||||
using TMPro;
|
||||
|
||||
/// <summary>
|
||||
Loading…
x
Reference in New Issue
Block a user