taosuqi
/
CultivationOfBrewing-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master

This commit is contained in:
taosuqi 2025-05-26 11:21:43 +08:00
parent b16cf7b59c 3416766089
commit 2a9b04eb37
6 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
View File

@ -956,6 +956,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1927580342, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945565, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_Name
value: Player
@ -3241,6 +3245,25 @@ MeshRenderer:
m_CorrespondingSourceObject: {fileID: -9207319362877345106, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3}
m_PrefabInstance: {fileID: 1774722050}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1349304440 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -6718103350785757407, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3}
m_PrefabInstance: {fileID: 1774722050}
m_PrefabAsset: {fileID: 0}
--- !u!64 &1349304441
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1349304440}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 5941571640879720808, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3}
--- !u!64 &1414877079
MeshCollider:
m_ObjectHideFlags: 0

2
Assets/Resources/Prefabs/Objects/Tools/剪刀.prefab
View File

@ -195,7 +195,7 @@ Transform:
m_GameObject: {fileID: 7317887664770417626}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8903856354824536835}

2
Assets/Resources/Prefabs/Objects/Tools/放大镜.prefab
View File

@ -30,7 +30,7 @@ Transform:
m_GameObject: {fileID: 8844781641072810642}
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_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}

2
Assets/Resources/Prefabs/Objects/Tools/解剖刀.prefab
View File

@ -30,7 +30,7 @@ Transform:
m_GameObject: {fileID: 846562597701184814}
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_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}

2
Assets/Resources/Prefabs/Objects/Tools/镊子.prefab
View File

@ -30,7 +30,7 @@ Transform:
m_GameObject: {fileID: 296639407149506318}
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_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}

2
Assets/Scripts/Project/UI/UI_Panel/UI_MainTitlePanel.cs
View File

@ -66,7 +66,7 @@ public class UI_MainTitlePanel : BasePanel
break;
}
///模式显示父物体
GetControl<Image>("modelText").gameObject.SetActive(mode != "");
//GetControl<Image>("modelText").gameObject.SetActive(mode != "");//HQB 20250526
//GetControl<Image>("userName").gameObject.SetActive(mode != string.Empty && mode != "学习模式");
///模式显示text