WXGame/Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta

fileFormatVersion: 2
guid: 96132ae8c02642748804dc8b5f9f148e
NativeFormatImporter:
  externalObjects: {}
<<<<<<< Updated upstream
  mainObjectFileID: 11400000
=======
  mainObjectFileID: 0
>>>>>>> Stashed changes
  userData: 
  assetBundleName: 
  assetBundleVariant:
铁匠项目 2024-10-23 09:14:01 +08:00			`fileFormatVersion: 2`
铁匠抖音接入 2024-12-18 11:12:52 +08:00			`guid: 96132ae8c02642748804dc8b5f9f148e`
铁匠项目 2024-10-23 09:14:01 +08:00			`NativeFormatImporter:`
			`externalObjects: {}`
$DESKTOP-DDTRVOR\asus$ Merge branch 'main' into TT # Conflicts: # .gitignore # Blacksmith/Assets/Editor/StarkBuilderSetting.asset # Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta # Blacksmith/Assets/Script/GameSystem.cs # Blacksmith/Assets/Script/UI/ForgePanel.cs # Blacksmith/UserSettings/Layouts/default-2022.dwlt # Blacksmith/project.config.json 2024-12-23 15:25:21 +08:00			`<<<<<<< Updated upstream`
铁匠项目 2024-10-23 09:14:01 +08:00			`mainObjectFileID: 11400000`
$DESKTOP-DDTRVOR\asus$ Merge branch 'main' into TT # Conflicts: # .gitignore # Blacksmith/Assets/Editor/StarkBuilderSetting.asset # Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta # Blacksmith/Assets/Script/GameSystem.cs # Blacksmith/Assets/Script/UI/ForgePanel.cs # Blacksmith/UserSettings/Layouts/default-2022.dwlt # Blacksmith/project.config.json 2024-12-23 15:25:21 +08:00			`=======`
$DESKTOP-DDTRVOR\asus$ 修改开店动画逻辑 2024-12-23 14:40:13 +08:00			`mainObjectFileID: 0`
$DESKTOP-DDTRVOR\asus$ Merge branch 'main' into TT # Conflicts: # .gitignore # Blacksmith/Assets/Editor/StarkBuilderSetting.asset # Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta # Blacksmith/Assets/Script/GameSystem.cs # Blacksmith/Assets/Script/UI/ForgePanel.cs # Blacksmith/UserSettings/Layouts/default-2022.dwlt # Blacksmith/project.config.json 2024-12-23 15:25:21 +08:00			`>>>>>>> Stashed changes`
铁匠项目 2024-10-23 09:14:01 +08:00			`userData:`
			`assetBundleName:`
			`assetBundleVariant:`