Merge remote-tracking branch 'refs/remotes/origin/taptap'

# Conflicts:
#	Assets/000_assets/material/M_SquareFrame 1.mat
#	Assets/FR2_Cache.asset
#	Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
#	Packages/packages-lock.json
#	ProjectSettings/PackageManagerSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	UserSettings/Layouts/CurrentMaximizeLayout.dwlt
#	UserSettings/Layouts/default-6000.dwlt
#	ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat
#	ichni_Official.slnx
This commit is contained in:
2026-06-15 12:44:31 +08:00
79 changed files with 720 additions and 378 deletions

View File

@@ -18735,6 +18735,59 @@ RectTransform:
m_AnchoredPosition: {x: 64.99996, y: 393}
m_SizeDelta: {x: 980, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1644203569
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1644203571}
- component: {fileID: 1644203570}
m_Layer: 0
m_Name: ThirdPartyService
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1644203570
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644203569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 656278590545491483e2e888078b504e, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Online.Logic.ThirdPartyServiceManager
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes: []
--- !u!4 &1644203571
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644203569}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 224.24973, y: 0, z: 3.18235}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1647879290
GameObject:
m_ObjectHideFlags: 0
@@ -30046,3 +30099,4 @@ SceneRoots:
- {fileID: 2081546315}
- {fileID: 1067413317}
- {fileID: 325881262}
- {fileID: 1644203571}