Warcorrespondents/UserSettings/EditorUserSettings.asset

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedScenePath-0:
<<<<<<< HEAD
      value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25
=======
<<<<<<< HEAD
      value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb
=======
      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
>>>>>>> 5d812753da2f9af3c5b8640dd11b561df5989be2
      flags: 0
    RecentlyUsedScenePath-1:
      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
      flags: 0
<<<<<<< HEAD
    RecentlyUsedScenePath-2:
      value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
      flags: 0
<<<<<<< HEAD
=======
    RecentlyUsedScenePath-4:
      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
      flags: 0
=======
>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
>>>>>>> 5d812753da2f9af3c5b8640dd11b561df5989be2
    vcSharedLogLevel:
      value: 0d5e400f0650
      flags: 0
  m_VCAutomaticAdd: 1
  m_VCDebugCom: 0
  m_VCDebugCmd: 0
  m_VCDebugOut: 0
  m_SemanticMergeMode: 2
  m_VCShowFailedCheckout: 1
  m_VCOverwriteFailedCheckoutAssets: 1
  m_VCProjectOverlayIcons: 1
  m_VCHierarchyOverlayIcons: 1
  m_VCOtherOverlayIcons: 1
  m_VCAllowAsyncUpdate: 1
1 2021-07-01 03:08:38 +08:00			`%YAML 1.1`
			`%TAG !u! tag:unity3d.com,2011:`
			`--- !u!162 &1`
			`EditorUserSettings:`
			`m_ObjectHideFlags: 0`
			`serializedVersion: 4`
			`m_ConfigSettings:`
加入了镜面与水面的Shader 2021-07-05 23:15:29 +08:00			`RecentlyUsedScenePath-0:`
Merge branch 'RomanVersion' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents into RomanVersion # Conflicts: # UserSettings/EditorUserSettings.asset 2021-07-25 01:05:39 +08:00			`<<<<<<< HEAD`
？？ 2021-07-25 00:59:49 +08:00			`value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25`
Merge branch 'RomanVersion' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents into RomanVersion # Conflicts: # UserSettings/EditorUserSettings.asset 2021-07-25 01:05:39 +08:00			`=======`
自动解决冲突改他妈的批 2021-07-25 00:01:19 +08:00			`<<<<<<< HEAD`
1.优化项目结构 2.删除没用的场景 3.将各种系统都保存为预制体 4.分好了场景内的游戏物体分级 2021-07-24 23:57:48 +08:00			`value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb`
自动解决冲突改他妈的批 2021-07-25 00:01:19 +08:00			`=======`
1.增加了老爹的回忆场景，但是人物还没有加入移动，我不大会使呜呜。 2.增加了视觉差parallax的代码，并在第一个场景的背景加入了视差。 3.第一个场景的可交互物品加入了提示灯光（暂定效果） 4.战场加入了硝烟粒子特效 2021-07-24 08:26:28 +08:00			`value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb`
自动解决冲突改他妈的批 2021-07-25 00:01:19 +08:00			`>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6`
Merge branch 'RomanVersion' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents into RomanVersion # Conflicts: # UserSettings/EditorUserSettings.asset 2021-07-25 01:05:39 +08:00			`>>>>>>> 5d812753da2f9af3c5b8640dd11b561df5989be2`
加入了镜面与水面的Shader 2021-07-05 23:15:29 +08:00			`flags: 0`
			`RecentlyUsedScenePath-1:`
？？ 2021-07-25 00:59:49 +08:00			`value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb`
加入了镜面与水面的Shader 2021-07-05 23:15:29 +08:00			`flags: 0`
自动解决冲突改他妈的批 2021-07-25 00:01:19 +08:00			`<<<<<<< HEAD`
1 2021-07-08 21:02:05 +08:00			`RecentlyUsedScenePath-2:`
1.优化项目结构 2.删除没用的场景 3.将各种系统都保存为预制体 4.分好了场景内的游戏物体分级 2021-07-24 23:57:48 +08:00			`value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb`
1.添加了一系列shader a.镜面反射 b.水面反射 c.炸弹冲击波 2021-07-08 22:58:46 +08:00			`flags: 0`
Merge branch 'RomanVersion' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents into RomanVersion # Conflicts: # UserSettings/EditorUserSettings.asset 2021-07-25 01:05:39 +08:00			`<<<<<<< HEAD`
			`=======`
1.优化项目结构 2.删除没用的场景 3.将各种系统都保存为预制体 4.分好了场景内的游戏物体分级 2021-07-24 23:57:48 +08:00			`RecentlyUsedScenePath-4:`
			`value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb`
1.添加了一系列shader a.镜面反射 b.水面反射 c.炸弹冲击波 2021-07-08 22:58:46 +08:00			`flags: 0`
自动解决冲突改他妈的批 2021-07-25 00:01:19 +08:00			`=======`
			`>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6`
Merge branch 'RomanVersion' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents into RomanVersion # Conflicts: # UserSettings/EditorUserSettings.asset 2021-07-25 01:05:39 +08:00			`>>>>>>> 5d812753da2f9af3c5b8640dd11b561df5989be2`
1 2021-07-01 03:08:38 +08:00			`vcSharedLogLevel:`
			`value: 0d5e400f0650`
			`flags: 0`
			`m_VCAutomaticAdd: 1`
			`m_VCDebugCom: 0`
			`m_VCDebugCmd: 0`
			`m_VCDebugOut: 0`
			`m_SemanticMergeMode: 2`
			`m_VCShowFailedCheckout: 1`
			`m_VCOverwriteFailedCheckoutAssets: 1`
			`m_VCProjectOverlayIcons: 1`
			`m_VCHierarchyOverlayIcons: 1`
			`m_VCOtherOverlayIcons: 1`
			`m_VCAllowAsyncUpdate: 1`