Skip to content

GitLab

Commit aeb50288 authored by gaorui's avatar gaorui
Browse files

Merge branch 'develop' into 'main' 

Develop

See merge request unity-cross/UnityDemo!13
parents 274f3796 d8b0a35f
Hide whitespace changes
Inline Side-by-side
Assets/Plugins/Android/LauncherManifest.xml
View file @ aeb50288
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
android:normalScreens="true" android:smallScreens="true" android:xlargeScreens="true" /> android:normalScreens="true" android:smallScreens="true" android:xlargeScreens="true" />
<meta-data
android:name="android.max_aspect"
android:value="2.5"
android:allowBackup="false"
android:requestLegacyExternalStorage="true"/>
<queries> <queries>
<intent> <intent>
...@@ -32,18 +27,23 @@ ...@@ -32,18 +27,23 @@
<application android:name="com.unity.game.Application" <application android:name="com.unity.game.Application"
android:theme="@style/UnityThemeSelector"
android:icon="@mipmap/app_icon" android:icon="@mipmap/app_icon"
android:label="@string/app_name" android:label="@string/app_name"
android:allowBackup="false" android:allowBackup="false"
android:extractNativeLibs="true" android:extractNativeLibs="true"
android:resizeableActivity="false" android:resizeableActivity="false"
android:supportsRtl="true"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:usesCleartextTraffic="true"> android:usesCleartextTraffic="true">
<activity android:name="com.unity.game.GameActivity" <activity android:name="com.unity.game.GameActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density"
android:exported="true" android:hardwareAccelerated="false" android:exported="true"
android:launchMode="singleTask" android:theme="@style/UnityThemeSelector"> android:hardwareAccelerated="true"
android:resizeableActivity="false"
android:screenOrientation="sensorLandscape"
android:launchMode="singleTask" >
<intent-filter> <intent-filter>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
...@@ -61,6 +61,10 @@ ...@@ -61,6 +61,10 @@
android:name="notch_support" android:name="notch_support"
android:value="true"/> android:value="true"/>
</activity> </activity>
<meta-data android:name="android.max_aspect" android:value="2.4" />
<!-- 该标签必须加 --> <!-- 该标签必须加 -->
<meta-data <meta-data
android:name="MAIN_ACTIVITY" android:name="MAIN_ACTIVITY"
......
Assets/Scenes/SampleScene.unity
View file @ aeb50288
...@@ -158,8 +158,8 @@ RectTransform: ...@@ -158,8 +158,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: -450} m_AnchoredPosition: {x: -1000, y: -300}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &40919616 --- !u!114 &40919616
MonoBehaviour: MonoBehaviour:
...@@ -205,7 +205,7 @@ MonoBehaviour: ...@@ -205,7 +205,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnPayWithSpecificGoodsBtnClicked m_MethodName: OnPayWithSpecificGoodsBtnClicked
m_Mode: 3 m_Mode: 3
...@@ -255,140 +255,6 @@ CanvasRenderer: ...@@ -255,140 +255,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 40919614} m_GameObject: {fileID: 40919614}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &65284393
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 65284394}
- component: {fileID: 65284396}
- component: {fileID: 65284395}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &65284394
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65284393}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1114040581}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &65284395
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65284393}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: ProductInfos
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &65284396
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 65284393}
m_CullTransparentMesh: 1
--- !u!1 &85050635 --- !u!1 &85050635
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -473,8 +339,8 @@ MonoBehaviour: ...@@ -473,8 +339,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 32
m_fontSizeBase: 24 m_fontSizeBase: 32
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -606,7 +472,7 @@ MonoBehaviour: ...@@ -606,7 +472,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnCDKBtnClicked m_MethodName: OnCDKBtnClicked
m_Mode: 1 m_Mode: 1
...@@ -693,7 +559,7 @@ RectTransform: ...@@ -693,7 +559,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: 0} m_AnchoredPosition: {x: -1000, y: 0}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &165585585 --- !u!114 &165585585
MonoBehaviour: MonoBehaviour:
...@@ -739,8 +605,8 @@ MonoBehaviour: ...@@ -739,8 +605,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnPayBtnClicked m_MethodName: OnPayBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -870,7 +736,7 @@ RectTransform: ...@@ -870,7 +736,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: 150} m_AnchoredPosition: {x: -1000, y: 150}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &259715465 --- !u!114 &259715465
MonoBehaviour: MonoBehaviour:
...@@ -916,8 +782,8 @@ MonoBehaviour: ...@@ -916,8 +782,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnEnterServerBtnClicked m_MethodName: OnEnterServerBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -1050,8 +916,8 @@ MonoBehaviour: ...@@ -1050,8 +916,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 30
m_fontSizeBase: 24 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -1173,7 +1039,7 @@ RectTransform: ...@@ -1173,7 +1039,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: 300} m_AnchoredPosition: {x: -1000, y: 300}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5000001, y: 0.5} m_Pivot: {x: 0.5000001, y: 0.5}
--- !u!114 &633987596 --- !u!114 &633987596
MonoBehaviour: MonoBehaviour:
...@@ -1219,8 +1085,8 @@ MonoBehaviour: ...@@ -1219,8 +1085,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnLogoutBtnClicked m_MethodName: OnLogoutBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -1305,7 +1171,6 @@ RectTransform: ...@@ -1305,7 +1171,6 @@ RectTransform:
- {fileID: 259715464} - {fileID: 259715464}
- {fileID: 165585584} - {fileID: 165585584}
- {fileID: 1577749884} - {fileID: 1577749884}
- {fileID: 1114040581}
- {fileID: 40919615} - {fileID: 40919615}
- {fileID: 1370639142} - {fileID: 1370639142}
- {fileID: 1889515970} - {fileID: 1889515970}
...@@ -1775,8 +1640,8 @@ MonoBehaviour: ...@@ -1775,8 +1640,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 30
m_fontSizeBase: 24 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -1963,8 +1828,9 @@ GameObject: ...@@ -1963,8 +1828,9 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1076467005} - component: {fileID: 1076467005}
- component: {fileID: 1076467004} - component: {fileID: 1076467004}
- component: {fileID: 1076467006}
m_Layer: 0 m_Layer: 0
m_Name: BtnManager m_Name: GameSdkManager
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -1979,7 +1845,7 @@ MonoBehaviour: ...@@ -1979,7 +1845,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1076467003} m_GameObject: {fileID: 1076467003}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 789ca815eac2f468b94840a621f0b2e3, type: 3} m_Script: {fileID: 11500000, guid: db8ae1edca0a54e5f94548a5091c8cdb, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!4 &1076467005 --- !u!4 &1076467005
...@@ -1997,139 +1863,18 @@ Transform: ...@@ -1997,139 +1863,18 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1114040580 --- !u!114 &1076467006
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1114040581}
- component: {fileID: 1114040584}
- component: {fileID: 1114040583}
- component: {fileID: 1114040582}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1114040581
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 65284394}
m_Father: {fileID: 642178995}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: -300}
m_SizeDelta: {x: 240, y: 80}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1114040582
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1114040583}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1076467004}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnPayWithFirstGoodsBtnClicked
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1114040583
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580} m_GameObject: {fileID: 1076467003}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: 789ca815eac2f468b94840a621f0b2e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1114040584
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1114040580}
m_CullTransparentMesh: 1
--- !u!1 &1183967693 --- !u!1 &1183967693
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2214,8 +1959,8 @@ MonoBehaviour: ...@@ -2214,8 +1959,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 30
m_fontSizeBase: 24 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -2541,7 +2286,7 @@ MonoBehaviour: ...@@ -2541,7 +2286,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, Assembly-CSharp m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnExitBtnClicked m_MethodName: OnExitBtnClicked
m_Mode: 1 m_Mode: 1
...@@ -2755,7 +2500,7 @@ RectTransform: ...@@ -2755,7 +2500,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -700, y: 150} m_AnchoredPosition: {x: -700, y: 150}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1459490477 --- !u!114 &1459490477
MonoBehaviour: MonoBehaviour:
...@@ -2801,8 +2546,8 @@ MonoBehaviour: ...@@ -2801,8 +2546,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnShareBtnClicked m_MethodName: OnShareBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -3010,8 +2755,8 @@ MonoBehaviour: ...@@ -3010,8 +2755,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 32
m_fontSizeBase: 24 m_fontSizeBase: 32
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -3176,7 +2921,7 @@ RectTransform: ...@@ -3176,7 +2921,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1000, y: -150} m_AnchoredPosition: {x: -1000, y: -150}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1577749885 --- !u!114 &1577749885
MonoBehaviour: MonoBehaviour:
...@@ -3222,8 +2967,8 @@ MonoBehaviour: ...@@ -3222,8 +2967,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnGetProductInfoBtnClicked m_MethodName: OnGetProductInfoBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -3356,8 +3101,8 @@ MonoBehaviour: ...@@ -3356,8 +3101,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 30
m_fontSizeBase: 24 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -3750,8 +3495,8 @@ MonoBehaviour: ...@@ -3750,8 +3495,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 30
m_fontSizeBase: 24 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -3884,8 +3629,8 @@ MonoBehaviour: ...@@ -3884,8 +3629,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 30
m_fontSizeBase: 24 m_fontSizeBase: 30
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
...@@ -3971,7 +3716,7 @@ RectTransform: ...@@ -3971,7 +3716,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -700, y: 450} m_AnchoredPosition: {x: -700, y: 450}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1889515971 --- !u!114 &1889515971
MonoBehaviour: MonoBehaviour:
...@@ -4017,8 +3762,8 @@ MonoBehaviour: ...@@ -4017,8 +3762,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnOpenAccountBtnClicked m_MethodName: OnOpenAccountBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -4104,7 +3849,7 @@ RectTransform: ...@@ -4104,7 +3849,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -700, y: 300} m_AnchoredPosition: {x: -700, y: 300}
m_SizeDelta: {x: 240, y: 80} m_SizeDelta: {x: 260, y: 120}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1966209685 --- !u!114 &1966209685
MonoBehaviour: MonoBehaviour:
...@@ -4150,8 +3895,8 @@ MonoBehaviour: ...@@ -4150,8 +3895,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnOpenServiceBtnClicked m_MethodName: OnOpenServiceBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -4283,8 +4028,8 @@ MonoBehaviour: ...@@ -4283,8 +4028,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1076467004} - m_Target: {fileID: 1076467006}
m_TargetAssemblyTypeName: GameManager, NewAssembly m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
m_MethodName: OnLoginBtnClicked m_MethodName: OnLoginBtnClicked
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -4417,8 +4162,8 @@ MonoBehaviour: ...@@ -4417,8 +4162,8 @@ MonoBehaviour:
m_faceColor: m_faceColor:
serializedVersion: 2 serializedVersion: 2
rgba: 4294967295 rgba: 4294967295
m_fontSize: 24 m_fontSize: 32
m_fontSizeBase: 24 m_fontSizeBase: 32
m_fontWeight: 400 m_fontWeight: 400
m_enableAutoSizing: 0 m_enableAutoSizing: 0
m_fontSizeMin: 18 m_fontSizeMin: 18
......
Assets/Scripts/demo/ui/BtnManager.cs → Assets/Scripts/demo/ui/GameSdkManager.cs
View file @ aeb50288
...@@ -5,22 +5,40 @@ using UnityEngine; ...@@ -5,22 +5,40 @@ using UnityEngine;
public class GameManager : MonoBehaviour public class GameManager : MonoBehaviour
{ {
private void Awake()
{
// 触发单例构造，内部会调用 PlatformCallback.SetListener(this)
var _ = HoolaiListener.Instance;
}
//Android 需监听返回事件，如果当前场景没有返回拦截了需调用 SDK 的退出接口
void Update()
{
if (Input.GetKey(KeyCode.Escape))
{
NativeLogger.I("Game_Unity_Log", "clicked Exit");
HoolaiSdkManager.ExitGame();
}
}
public void OnLoginBtnClicked() public void OnLoginBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked login"); NativeLogger.I("Game_Unity_Log", "clicked login");
//SdkPluginManager.CallSdkLogin(); //SdkPluginManager.CallSdkLogin();
HoolaiSdkManager.Login(); HoolaiSdkManager.Login();
} }
public void OnLogoutBtnClicked() public void OnLogoutBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked logout"); NativeLogger.I("Game_Unity_Log", "clicked logout");
HoolaiSdkManager.Logout(); HoolaiSdkManager.Logout();
} }
public void OnEnterServerBtnClicked() public void OnEnterServerBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked EnterServer"); NativeLogger.I("Game_Unity_Log", "clicked EnterServer");
PlayerInfo playerInfo = new PlayerInfo(); PlayerInfo playerInfo = new PlayerInfo();
playerInfo.RoleId = "1234567"; playerInfo.RoleId = "1234567";
playerInfo.RoleName = "大鹏一日同风起"; playerInfo.RoleName = "大鹏一日同风起";
...@@ -45,15 +63,19 @@ public class GameManager : MonoBehaviour ...@@ -45,15 +63,19 @@ public class GameManager : MonoBehaviour
HoolaiSdkManager.SendEvent(EventType.EnterServer, playerInfo); HoolaiSdkManager.SendEvent(EventType.EnterServer, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked EnterServer");
HoolaiSdkManager.SendEvent(EventType.CreateRole, playerInfo); HoolaiSdkManager.SendEvent(EventType.CreateRole, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked CreateRole");
HoolaiSdkManager.SendEvent(EventType.LevelUp, playerInfo); HoolaiSdkManager.SendEvent(EventType.LevelUp, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked LevelUp");
HoolaiSdkManager.SendEvent(EventType.CustomerAction, playerInfo); HoolaiSdkManager.SendEvent(EventType.CustomerAction, playerInfo);
NativeLogger.I("Game_Unity_Log", "clicked CustomerAction");
} }
public void OnPayBtnClicked() public void OnPayBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked Pay"); NativeLogger.I("Game_Unity_Log", "clicked Pay");
// 1. 创建并填充对象 // 1. 创建并填充对象
PayParams payParams = new PayParams PayParams payParams = new PayParams
...@@ -69,58 +91,22 @@ public class GameManager : MonoBehaviour ...@@ -69,58 +91,22 @@ public class GameManager : MonoBehaviour
payParams.AddOptionalParameter("test", "daily_bonus"); payParams.AddOptionalParameter("test", "daily_bonus");
payParams.AddOptionalParameter("player_id", "p-98765"); payParams.AddOptionalParameter("player_id", "p-98765");
NativeLogger.I("fastsdk_btn_unity", $"clicked Exit jsonString: {payParams}"); NativeLogger.I("Game_Unity_Log", $"clicked Exit jsonString: {payParams}");
HoolaiSdkManager.StartPay(payParams); HoolaiSdkManager.StartPay(payParams);
} }
public void OnExitBtnClicked() public void OnExitBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked Exit"); NativeLogger.I("Game_Unity_Log", "clicked Exit");
HoolaiSdkManager.ExitGame(); HoolaiSdkManager.ExitGame();
} }
public void OnGetProductInfoBtnClicked() public void OnGetProductInfoBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked QueryGoodsInfo"); NativeLogger.I("Game_Unity_Log", "clicked QueryGoodsInfo");
HoolaiSdkManager.QueryGoodsInfo(); HoolaiSdkManager.QueryGoodsInfo();
} }
// 新增方法：使用商品列表中的第一条数据进行支付
public void OnPayWithFirstGoodsBtnClicked()
{
NativeLogger.I("fastsdk_btn_unity", "clicked Pay With First Goods");
List<GoodsInfo> goodsList = PlatformCallback.GetCachedGoodsList();
if (goodsList == null || goodsList.Count == 0)
{
NativeLogger.I("fastsdk_btn_unity", "No goods list available. Please query goods info first.");
return;
}
// 使用第一条商品数据进行支付
GoodsInfo firstGoods = GetGoodsInfoByIndex(goodsList, 0);
if (firstGoods != null)
{
// 将GoodsInfo转换为PayParams
PayParams payParams = ConvertGoodsInfoToPayParams(firstGoods, 1);
if (payParams != null)
{
NativeLogger.I("fastsdk_btn_unity", $"Paying with goods: {firstGoods.itemName}");
HoolaiSdkManager.StartPay(payParams);
}
else
{
NativeLogger.I("fastsdk_btn_unity", "Failed to convert goods info to pay params");
}
}
else
{
NativeLogger.I("fastsdk_btn_unity", "No goods available at index 0");
}
}
// 添加方法用于根据索引获取单个商品信息 // 添加方法用于根据索引获取单个商品信息
public static GoodsInfo GetGoodsInfoByIndex(List<GoodsInfo> goodsList, int index) public static GoodsInfo GetGoodsInfoByIndex(List<GoodsInfo> goodsList, int index)
...@@ -138,14 +124,14 @@ public class GameManager : MonoBehaviour ...@@ -138,14 +124,14 @@ public class GameManager : MonoBehaviour
// 新增方法：使用指定索引的商品数据进行支付 // 新增方法：使用指定索引的商品数据进行支付
public void OnPayWithSpecificGoodsBtnClicked(int goodsIndex) public void OnPayWithSpecificGoodsBtnClicked(int goodsIndex)
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked Pay With Random Goods"); NativeLogger.I("Game_Unity_Log", "clicked Pay With Random Goods");
// 获取缓存的商品列表 // 获取缓存的商品列表
List<GoodsInfo> goodsList = PlatformCallback.GetCachedGoodsList(); List<GoodsInfo> goodsList = HoolaiListener.Instance.GetCachedGoodsList();
if (goodsList == null || goodsList.Count == 0) if (goodsList == null || goodsList.Count == 0)
{ {
NativeLogger.I("fastsdk_btn_unity", "No goods list available. Please query goods info first."); NativeLogger.I("Game_Unity_Log", "No goods list available. Please query goods info first.");
return; return;
} }
...@@ -160,17 +146,17 @@ public class GameManager : MonoBehaviour ...@@ -160,17 +146,17 @@ public class GameManager : MonoBehaviour
if (payParams != null) if (payParams != null)
{ {
NativeLogger.I("fastsdk_btn_unity", $"Paying with random goods: {randomGoods.itemName} at index {randomIndex}"); NativeLogger.I("Game_Unity_Log", $"Paying with random goods: {randomGoods.itemName} at index {randomIndex}");
HoolaiSdkManager.StartPay(payParams); HoolaiSdkManager.StartPay(payParams);
} }
else else
{ {
NativeLogger.I("fastsdk_btn_unity", "Failed to convert goods info to pay params"); NativeLogger.I("Game_Unity_Log", "Failed to convert goods info to pay params");
} }
} }
else else
{ {
NativeLogger.I("fastsdk_btn_unity", "No goods available at random index"); NativeLogger.I("Game_Unity_Log", "No goods available at random index");
} }
} }
...@@ -198,26 +184,27 @@ public class GameManager : MonoBehaviour ...@@ -198,26 +184,27 @@ public class GameManager : MonoBehaviour
public void OnCDKBtnClicked() public void OnCDKBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked CDKey"); NativeLogger.I("Game_Unity_Log", "clicked CDKey");
HoolaiSdkManager.AccessParticipate(AccessActivityType.CD_KEY, "123456789"); HoolaiSdkManager.AccessParticipate(AccessActivityType.CD_KEY, "123456789");
} }
public void OnShareBtnClicked() public void OnShareBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked shareData"); NativeLogger.I("Game_Unity_Log", "clicked shareData");
HoolaiSdkManager.ShareData(1, 1, "test"); HoolaiSdkManager.ShareData(1, 1, "test");
} }
public void OnOpenServiceBtnClicked() public void OnOpenServiceBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked openService"); NativeLogger.I("Game_Unity_Log", "clicked openService");
HoolaiSdkManager.OpenService(); HoolaiSdkManager.OpenService();
} }
public void OnOpenAccountBtnClicked() public void OnOpenAccountBtnClicked()
{ {
NativeLogger.I("fastsdk_btn_unity", "clicked openAccount"); NativeLogger.I("Game_Unity_Log", "clicked openAccount");
HoolaiSdkManager.OpenAccountCenter(); HoolaiSdkManager.OpenAccountCenter();
} }
} }
Assets/Scripts/demo/ui/HoolaiListener.cs 0 → 100644
View file @ aeb50288
using System;
using System.Collections.Generic;
public class HoolaiListener : IPlatformCallbackListener
{
private static HoolaiListener _instance;
private List<GoodsInfo> _cachedGoodsList;
//商品列表更新事件
public event Action<List<GoodsInfo>> OnGoodsListUpdated;
public static HoolaiListener Instance
{
get
{
if (_instance == null)
{
_instance = new HoolaiListener();
}
return _instance;
}
}
private HoolaiListener()
{
// 自动设置监听器
PlatformCallback.SetListener(this);
}
public void OnInitSuccess(InitResult result)
{
NativeLogger.I("Game_Unity_Callback", $"OnInitSuccess GameId:{result.gameId} channel:{result.channel} channelId:{result.channelId}");
}
public void OnInitFailed(string reason)
{
NativeLogger.I("Game_Unity_Callback", $"OnInitFailed reason:{reason}");
}
public void OnLoginFailed(string reason)
{
NativeLogger.I("Game_Unity_Callback", $"OnLoginFailed reason:{reason}");
}
public void OnLoginSuccess(LoginResult result)
{
NativeLogger.I("Game_Unity_Callback", $"OnLoginSuccess uid:{result.uid} channel:{result.channel} channelId:{result.accessToken}");
}
public void OnRefreshUser(LoginResult result)
{
NativeLogger.I("Game_Unity_Callback", $"OnRefreshUser uid:{result.uid} channel:{result.channel} channelId:{result.accessToken}");
}
public void OnLogout(string message)
{
NativeLogger.I("Game_Unity_Callback", $"OnLogout reason:{message}");
}
public void OnPayFailed(string reason)
{
NativeLogger.I("Game_Unity_Callback", $"OnPayFailed reason:{reason}");
}
public void OnPayGoodsList(List<GoodsInfo> goodsList)
{
_cachedGoodsList = goodsList;
OnGoodsListUpdated?.Invoke(goodsList);
NativeLogger.I("Game_Unity_Callback", $"OnPayGoodsList count:{goodsList?.Count ?? 0}");
}
// 获取缓存的商品列表
public List<GoodsInfo> GetCachedGoodsList()
{
return _cachedGoodsList;
}
public void OnPaySuccess(string message)
{
NativeLogger.I("Game_Unity_Callback", $"OnPaySuccess message:{message}");
}
public void OnShareFailed(string reason)
{
NativeLogger.I("Game_Unity_Callback", $"OnShareFailed reason:{reason}");
}
public void OnShareSuccess(string reason)
{
NativeLogger.I("Game_Unity_Callback", $"OnShareSuccess reason:{reason}");
}
public void OnUpdate(string data)
{
NativeLogger.I("Game_Unity_Callback", $"OnUpdate data:{data}");
}
public void OnCustomExit()
{
NativeLogger.I("Game_Unity_Callback", $"OnCustomExit show Game Exit Dialog!");
}
}
Assets/Scripts/sdk/ui.meta → Assets/Scripts/demo/ui/HoolaiListener.cs.meta
View file @ aeb50288
fileFormatVersion: 2 fileFormatVersion: 2
guid: ae9e5ac1843c944138202b504167711e guid: aad0e2f8fdce143148772b19097f0279
folderAsset: yes MonoImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
Assets/Scripts/sdk/channel/IosSdkInterface.cs
View file @ aeb50288
...@@ -78,5 +78,4 @@ public class IosSdkInterface ...@@ -78,5 +78,4 @@ public class IosSdkInterface
_OpenService(); _OpenService();
} }
} }
#endif
#endif // UNITY_IOS && !UNITY_EDITOR \ No newline at end of file
\ No newline at end of file
Assets/Scripts/sdk/core/IPlatformCallbackListener.cs 0 → 100644
View file @ aeb50288
using System.Collections.Generic;
public interface IPlatformCallbackListener
{
void OnInitSuccess(InitResult result);
void OnInitFailed(string reason);
void OnUpdate(string data);
void OnLoginSuccess(LoginResult result);
void OnLoginFailed(string reason);
void OnRefreshUser(LoginResult result);
void OnLogout(string message);
void OnPayGoodsList(List<GoodsInfo> goodsList);
void OnPaySuccess(string message);
void OnPayFailed(string reason);
void OnShareSuccess(string message);
void OnShareFailed(string reason);
void OnCustomExit();
}
\ No newline at end of file
Assets/Scripts/sdk/core/IPlatformCallbackListener.cs.meta 0 → 100644
View file @ aeb50288
fileFormatVersion: 2
guid: 0de7ca3e29910431bac56565a6da5f42
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/sdk/core/PlatformCallback.cs
View file @ aeb50288
...@@ -37,9 +37,7 @@ public class GoodsInfo ...@@ -37,9 +37,7 @@ public class GoodsInfo
public class PlatformCallback : MonoBehaviour public class PlatformCallback : MonoBehaviour
{ {
// 添加字段用于保存商品列表 private static IPlatformCallbackListener _listener;
private List<GoodsInfo> _goodsLists;
// 单例实现，确保只有一个接收器实例 // 单例实现，确保只有一个接收器实例
public static PlatformCallback Instance { get; private set; } public static PlatformCallback Instance { get; private set; }
...@@ -48,7 +46,7 @@ public class PlatformCallback : MonoBehaviour ...@@ -48,7 +46,7 @@ public class PlatformCallback : MonoBehaviour
// 单例模式实现 // 单例模式实现
if (Instance != null && Instance != this) if (Instance != null && Instance != this)
{ {
NativeLogger.I("fastsdk_unity_result", "[ ] Destroying duplicate instance"); NativeLogger.I("PlatformCallback", "[PlatformCallback] Destroying duplicate instance");
Destroy(gameObject); Destroy(gameObject);
return; return;
} }
...@@ -61,140 +59,129 @@ public class PlatformCallback : MonoBehaviour ...@@ -61,140 +59,129 @@ public class PlatformCallback : MonoBehaviour
// 确保游戏对象名称与 Android 调用匹配 // 确保游戏对象名称与 Android 调用匹配
gameObject.name = "PlatformCallback"; gameObject.name = "PlatformCallback";
NativeLogger.I("fastsdk_unity_result", "[PlatformCallback] Initialized with GameObject name: " + gameObject.name); NativeLogger.I("PlatformCallback", "[PlatformCallback] Initialized with GameObject name: " + gameObject.name);
} }
public static void SetListener(IPlatformCallbackListener listener)
{
_listener = listener;
}
public void onInitSuccess(string jsonStr) public void onInitSuccess(string jsonStr)
{ {
NativeLogger.I("PlatformCallback", "[PlatformCallback] onInitSuccess called with result: " + jsonStr);
Debug.Log("Unity onInitSuccess: " + jsonStr);
NativeLogger.I("fastsdk_unity_result", "[AndroidBrigsCall] onInitSuccess called with result: " + jsonStr);
InitResult result = JsonConvert.DeserializeObject<InitResult>(jsonStr); InitResult result = JsonConvert.DeserializeObject<InitResult>(jsonStr);
if (result != null) if (result != null)
{ {
NativeLogger.I("fastsdk_unity_result", "反序列化成功！"); _listener?.OnInitSuccess(result);
NativeLogger.I("fastsdk_unity_result", "Channel: " + result.channel);
NativeLogger.I("fastsdk_unity_result", "Game ID: " + result.gameId);
NativeLogger.I("fastsdk_unity_result", "Channel ID: " + result.channelId);
} }
} }
public void onInitFailed(string reason) public void onInitFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onInitFailed called with reason: " + reason); NativeLogger.I("PlatformCallback", "[PlatformCallback] onInitFailed called with reason: " + reason);
_listener?.OnInitFailed(reason);
} }
//自定义退出界面 //自定义退出界面
public void onCustomExit() public void onCustomExit()
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onCustomExit called"); NativeLogger.I("PlatformCallback", "[PlatformCallback] onCustomExit called");
_listener?.OnCustomExit();
} }
//预留 //预留
public void onUpdate(string data) public void onUpdate(string data)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onUpdate called with data: " + data); NativeLogger.I("PlatformCallback", "[PlatformCallback] onUpdate called with data: " + data);
_listener?.OnUpdate(data);
} }
//登录成功 //登录成功
public void onLoginSuccess(string jsonStr) public void onLoginSuccess(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onLoginSuccess called with result: " + jsonStr); NativeLogger.I("PlatformCallback", "[PlatformCallback] onLoginSuccess called with result: " + jsonStr);
//判断 null 或空字符串判断空白字符串（包括空格、制表符等） //判断 null 或空字符串判断空白字符串（包括空格、制表符等）
if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr)) if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr))
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] Android returned empty or invalid string"); NativeLogger.I("PlatformCallback", "[Unity] Android returned empty or invalid string");
return; return;
} }
LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr); LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr);
if (loginResult.uid != 0) { if (loginResult.uid != 0)
// 示例：如果接收到特定消息，切换到另一个场景 {
NativeLogger.I("fastsdk_unity_result", $"[Unity] Login successful, uid:{loginResult.uid} channel:{loginResult.channel} channelUid:{loginResult.channelUid} accessToken:{loginResult.accessToken}"); _listener?.OnLoginSuccess(loginResult);
} }
} }
public void onRefreshUser(string jsonStr) public void onRefreshUser(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onRefreshUser called with result: " + jsonStr); NativeLogger.I("PlatformCallback", "[PlatformCallback] onRefreshUser called with result: " + jsonStr);
//判断 null 或空字符串判断空白字符串（包括空格、制表符等） //判断 null 或空字符串判断空白字符串（包括空格、制表符等）
if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr)) if (string.IsNullOrEmpty(jsonStr) || string.IsNullOrWhiteSpace(jsonStr))
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] Android returned empty or invalid string"); NativeLogger.I("PlatformCallback", "[PlatformCallback] Android returned empty or invalid string");
return; return;
} }
LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr); LoginResult loginResult = JsonConvert.DeserializeObject<LoginResult>(jsonStr);
if (loginResult.uid != 0) if (loginResult.uid != 0)
{ {
// 示例：如果接收到特定消息，切换到另一个场景 _listener?.OnRefreshUser(loginResult);
NativeLogger.I("fastsdk_unity_result", $"[Unity] onRefreshUser Login successful, uid:{loginResult.uid} channel:{loginResult.channel} channelUid:{loginResult.channelUid} accessToken:{loginResult.accessToken}");
} }
} }
public void onLoginFailed(string reason) public void onLoginFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onLoginFailed called with reason: " + reason); NativeLogger.I("PlatformCallback", "[PlatformCallback] onLoginFailed called with reason: " + reason);
_listener?.OnLoginFailed(reason);
} }
public void onLogout(string message) public void onLogout(string message)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onLogout called with message: " + message); NativeLogger.I("PlatformCallback", "[PlatformCallback] onLogout called with message: " + message);
_listener?.OnLogout(message);
} }
public void onPayGoodsList(string jsonStr) public void onPayGoodsList(string jsonStr)
{ {
Debug.Log("Unity 收到商品列表: " + jsonStr); NativeLogger.I("PlatformCallback", "[PlatformCallback] onPayGoodsList called with message: " + jsonStr);
List<GoodsInfo> goodsLists = JsonConvert.DeserializeObject<List<GoodsInfo>>(jsonStr);
NativeLogger.I("fastsdk_unity_result", "[Unity] onPayGoodsList called with message: " + jsonStr); if (goodsLists != null && goodsLists.Count != 0)
//goodsList = JsonConvert.DeserializeObject<List<GoodsInfo>(jsonStr);
// 方法一：直接解析为List<GoodsInfo>
_goodsLists = JsonConvert.DeserializeObject<List<GoodsInfo>>(jsonStr);
if (_goodsLists != null && _goodsLists.Count!=0)
{ {
NativeLogger.I("fastsdk_unity_result", $"[Unity] onPayGoodsList: {_goodsLists}"); _listener?.OnPayGoodsList(goodsLists);
} }
} }
// 添加方法用于获取保存的商品列表
public static List<GoodsInfo> GetCachedGoodsList()
{
return Instance != null ? Instance._goodsLists : null;
}
public void onPaySuccess(string jsonStr) public void onPaySuccess(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", $"[Unity] onPaySuccess called {jsonStr}"); NativeLogger.I("PlatformCallback", $"[PlatformCallback] onPaySuccess called {jsonStr}");
_listener?.OnPaySuccess(jsonStr);
} }
public void onPayFailed(string reason) public void onPayFailed(string reason)
{ {
NativeLogger.I("fastsdk_unity_result", "[Unity] onPayFailed called with reason: " + reason); NativeLogger.I("PlatformCallback", "[PlatformCallback] onPayFailed called with reason: " + reason);
_listener?.OnPayFailed(reason);
} }
//分享，无特殊处理可不实现 //分享，无特殊处理可不实现
public void onShareSuccess(string jsonStr) public void onShareSuccess(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", $"[Unity] onShareSuccess called {jsonStr}"); NativeLogger.I("PlatformCallback", $"[PlatformCallback] onShareSuccess called {jsonStr}");
_listener?.OnShareSuccess(jsonStr);
} }
public void onShareFailed(string jsonStr) public void onShareFailed(string jsonStr)
{ {
NativeLogger.I("fastsdk_unity_result", $"[Unity] onShareFailed called {jsonStr}"); NativeLogger.I("PlatformCallback", $"[PlatformCallback] onShareFailed called {jsonStr}");
_listener?.OnShareFailed(jsonStr);
} }
} }
Assets/Scripts/sdk/util/NativeLogger.cs
View file @ aeb50288
...@@ -29,7 +29,7 @@ public static class NativeLogger ...@@ -29,7 +29,7 @@ public static class NativeLogger
#elif UNITY_IOS #elif UNITY_IOS
// 在 iOS 设备上，调用自定义的 NSLog 封装 // 在 iOS 设备上，调用自定义的 NSLog 封装
// (需要在 Xcode 项目中添加一个 .mm 文件来实现 _logToConsole) // (需要在 Xcode 项目中添加一个 .mm 文件来实现 _logToConsole)
_logToConsole($"[I] [{tag}] {message}"); //_logToConsole($"[I] [{tag}] {message}");
#endif #endif
} }
......
Packages/manifest.json
View file @ aeb50288
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
"com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.purchasing": "4.11.0",
"com.unity.test-framework": "1.1.33", "com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.7", "com.unity.textmeshpro": "3.0.7",
"com.unity.timeline": "1.7.7", "com.unity.timeline": "1.7.7",
......
Packages/packages-lock.json
View file @ aeb50288
...@@ -117,19 +117,6 @@ ...@@ -117,19 +117,6 @@
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.cn"
}, },
"com.unity.purchasing": {
"version": "4.11.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.services.core": "1.8.2"
},
"url": "https://packages.unity.cn"
},
"com.unity.services.analytics": { "com.unity.services.analytics": {
"version": "6.0.3", "version": "6.0.3",
"depth": 1, "depth": 1,
...@@ -143,7 +130,7 @@ ...@@ -143,7 +130,7 @@
}, },
"com.unity.services.core": { "com.unity.services.core": {
"version": "1.14.0", "version": "1.14.0",
"depth": 1, "depth": 2,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
......
ProjectSettings/ProjectSettings.asset
View file @ aeb50288
...@@ -419,62 +419,74 @@ PlayerSettings: ...@@ -419,62 +419,74 @@ PlayerSettings:
m_Height: 81 m_Height: 81
m_Kind: 2 m_Kind: 2
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 192 m_Width: 192
m_Height: 192 m_Height: 192
m_Kind: 1 m_Kind: 1
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 144 m_Width: 144
m_Height: 144 m_Height: 144
m_Kind: 1 m_Kind: 1
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 96 m_Width: 96
m_Height: 96 m_Height: 96
m_Kind: 1 m_Kind: 1
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 72 m_Width: 72
m_Height: 72 m_Height: 72
m_Kind: 1 m_Kind: 1
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 48 m_Width: 48
m_Height: 48 m_Height: 48
m_Kind: 1 m_Kind: 1
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 36 m_Width: 36
m_Height: 36 m_Height: 36
m_Kind: 1 m_Kind: 1
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 192 m_Width: 192
m_Height: 192 m_Height: 192
m_Kind: 0 m_Kind: 0
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 144 m_Width: 144
m_Height: 144 m_Height: 144
m_Kind: 0 m_Kind: 0
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 96 m_Width: 96
m_Height: 96 m_Height: 96
m_Kind: 0 m_Kind: 0
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 72 m_Width: 72
m_Height: 72 m_Height: 72
m_Kind: 0 m_Kind: 0
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 48 m_Width: 48
m_Height: 48 m_Height: 48
m_Kind: 0 m_Kind: 0
m_SubKind: m_SubKind:
- m_Textures: [] - m_Textures:
- {fileID: 0}
m_Width: 36 m_Width: 36
m_Height: 36 m_Height: 36
m_Kind: 0 m_Kind: 0
......
UserSettings/Layouts/CurrentMaximizeLayout.dwlt
View file @ aeb50288
...@@ -24,7 +24,7 @@ MonoBehaviour: ...@@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
controlID: 454 controlID: 1329
draggingID: 0 draggingID: 0
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -46,10 +46,10 @@ MonoBehaviour: ...@@ -46,10 +46,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 312 x: 296
y: 93 y: 93
width: 956 width: 903
height: 415 height: 356.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -532,7 +532,7 @@ MonoBehaviour: ...@@ -532,7 +532,7 @@ MonoBehaviour:
floating: 0 floating: 0
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: 48, y: 10} snapOffset: {x: 48, y: 48}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0 snapCorner: 0
id: UnityEditor.SceneViewCameraOverlay id: UnityEditor.SceneViewCameraOverlay
...@@ -577,9 +577,9 @@ MonoBehaviour: ...@@ -577,9 +577,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 895.5244, y: 503.87256, z: -13.946046} m_Target: {x: -198.00322, y: 218.21521, z: 0}
speed: 2 speed: 2
m_Value: {x: 895.5244, y: 503.87256, z: -13.946046} m_Value: {x: -198.00322, y: 218.21521, z: 0}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -629,9 +629,9 @@ MonoBehaviour: ...@@ -629,9 +629,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 1404.6097 m_Target: 400
speed: 2 speed: 2
m_Value: 1404.6097 m_Value: 400
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -675,12 +675,12 @@ MonoBehaviour: ...@@ -675,12 +675,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1270 width: 1201
height: 925 height: 925
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 1 vertical: 1
controlID: 455 controlID: 1330
draggingID: 0 draggingID: 0
--- !u!114 &4 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
...@@ -701,12 +701,12 @@ MonoBehaviour: ...@@ -701,12 +701,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1270 width: 1201
height: 436 height: 377.5
m_MinSize: {x: 200, y: 50} m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
controlID: 456 controlID: 1331
draggingID: 0 draggingID: 0
--- !u!114 &5 --- !u!114 &5
MonoBehaviour: MonoBehaviour:
...@@ -725,8 +725,8 @@ MonoBehaviour: ...@@ -725,8 +725,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 312 width: 296
height: 436 height: 377.5
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6} m_ActualView: {fileID: 6}
...@@ -756,8 +756,8 @@ MonoBehaviour: ...@@ -756,8 +756,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 93 y: 93
width: 311 width: 295
height: 415 height: 356.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -771,23 +771,23 @@ MonoBehaviour: ...@@ -771,23 +771,23 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 12680000 m_SelectedIDs: 8e7e0000
m_LastClickedID: 26642 m_LastClickedID: 32398
m_ExpandedIDs: 26fbffff4c670000 m_ExpandedIDs: 26e4ffff10eaffff5aeaffff1cecffff70edffff14f2ffff5ef2ffff40f4ffffbef8ffff26fbffffa6740000f47c0000267d00005e7d0000ee7d0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: Canvas
m_OriginalName: m_OriginalName: Canvas
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: 32398
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 5}
m_SearchString: m_SearchString:
...@@ -812,10 +812,10 @@ MonoBehaviour: ...@@ -812,10 +812,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 312 x: 296
y: 0 y: 0
width: 958 width: 905
height: 436 height: 377.5
m_MinSize: {x: 202, y: 221} m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 2} m_ActualView: {fileID: 2}
...@@ -844,10 +844,10 @@ MonoBehaviour: ...@@ -844,10 +844,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 312 x: 333
y: 93 y: 83
width: 956 width: 1013.5
height: 415 height: 516
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -900,24 +900,24 @@ MonoBehaviour: ...@@ -900,24 +900,24 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser m_Name: ConsoleWindow
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 436 y: 377.5
width: 1270 width: 1201
height: 489 height: 547.5
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 10} m_ActualView: {fileID: 11}
m_Panes: m_Panes:
- {fileID: 10} - {fileID: 10}
- {fileID: 11} - {fileID: 11}
- {fileID: 12} - {fileID: 12}
m_Selected: 0 m_Selected: 1
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -939,9 +939,9 @@ MonoBehaviour: ...@@ -939,9 +939,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 529 y: 470.5
width: 1269 width: 1200
height: 468 height: 526.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -963,7 +963,7 @@ MonoBehaviour: ...@@ -963,7 +963,7 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Plugins/Ios - Assets/Scenes
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ImportLogFlags: 0 m_ImportLogFlags: 0
...@@ -971,16 +971,16 @@ MonoBehaviour: ...@@ -971,16 +971,16 @@ MonoBehaviour:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Plugins/Ios - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: /Users/fengchao/Desktop/UnityDemo m_LastProjectPath: /Users/fengchao/Desktop/UnityDemo
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 94660000 m_SelectedIDs: c4660000
m_LastClickedID: 26260 m_LastClickedID: 26308
m_ExpandedIDs: 000000008266000084660000866600008866000000ca9a3b m_ExpandedIDs: 00000000ac660000ae660000b0660000b2660000b466000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1008,7 +1008,7 @@ MonoBehaviour: ...@@ -1008,7 +1008,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 000000008266000084660000866600008866000000ca9a3b m_ExpandedIDs: 00000000ac660000ae660000b0660000b2660000b466000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1033,9 +1033,9 @@ MonoBehaviour: ...@@ -1033,9 +1033,9 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: 12680000 m_SelectedInstanceIDs: d6660000
m_LastClickedInstanceID: 26642 m_LastClickedInstanceID: 26326
m_HadKeyboardFocusLastEvent: 0 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000b25c0000245a000000000000 m_ExpandedInstanceIDs: c6230000b25c0000245a000000000000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
...@@ -1085,9 +1085,9 @@ MonoBehaviour: ...@@ -1085,9 +1085,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 529 y: 470.5
width: 1269 width: 1200
height: 468 height: 526.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1118,7 +1118,7 @@ MonoBehaviour: ...@@ -1118,7 +1118,7 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 1
y: 620 y: 620
width: 1347.5 width: 1347.5
height: 367 height: 367
...@@ -1148,9 +1148,9 @@ MonoBehaviour: ...@@ -1148,9 +1148,9 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1270 x: 1201
y: 0 y: 0
width: 440 width: 509
height: 925 height: 925
m_MinSize: {x: 276, y: 71} m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4001, y: 4021}
...@@ -1179,9 +1179,9 @@ MonoBehaviour: ...@@ -1179,9 +1179,9 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1270 x: 1201
y: 93 y: 93
width: 439 width: 508
height: 904 height: 904
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
......
UserSettings/Layouts/default-2022.dwlt
View file @ aeb50288
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &1 --- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 621
y: 230
width: 641
height: 602
m_ShowMode: 0
m_Title: Build Settings
m_RootView: {fileID: 4}
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
m_Maximized: 0
--- !u!114 &2
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -39,67 +15,16 @@ MonoBehaviour: ...@@ -39,67 +15,16 @@ MonoBehaviour:
m_PixelRect: m_PixelRect:
serializedVersion: 2 serializedVersion: 2
x: -1 x: -1
y: 53 y: 63
width: 1920 width: 1710
height: 975 height: 975
m_ShowMode: 4 m_ShowMode: 4
m_Title: Project m_Title: "\u9879\u76EE"
m_RootView: {fileID: 5} m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1 m_Maximized: 1
--- !u!114 &3 --- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: BuildPlayerWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 641
height: 602
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 641
height: 602
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 4705
draggingID: 0
--- !u!114 &5
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -112,14 +37,14 @@ MonoBehaviour: ...@@ -112,14 +37,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 6} - {fileID: 3}
- {fileID: 8} - {fileID: 5}
- {fileID: 7} - {fileID: 4}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1710
height: 975 height: 975
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
...@@ -127,7 +52,7 @@ MonoBehaviour: ...@@ -127,7 +52,7 @@ MonoBehaviour:
m_TopViewHeight: 30 m_TopViewHeight: 30
m_UseBottomView: 1 m_UseBottomView: 1
m_BottomViewHeight: 20 m_BottomViewHeight: 20
--- !u!114 &6 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -144,12 +69,12 @@ MonoBehaviour: ...@@ -144,12 +69,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1710
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
m_LastLoadedLayoutName: m_LastLoadedLayoutName:
--- !u!114 &7 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -166,11 +91,11 @@ MonoBehaviour: ...@@ -166,11 +91,11 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 955 y: 955
width: 1920 width: 1710
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
--- !u!114 &8 --- !u!114 &5
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -183,20 +108,20 @@ MonoBehaviour: ...@@ -183,20 +108,20 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 9} - {fileID: 6}
- {fileID: 14} - {fileID: 11}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1920 width: 1710
height: 925 height: 925
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
controlID: 47 controlID: 37
draggingID: 0 draggingID: 0
--- !u!114 &9 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -209,20 +134,20 @@ MonoBehaviour: ...@@ -209,20 +134,20 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 7}
- {fileID: 10} - {fileID: 10}
- {fileID: 13}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1348.5 width: 1201
height: 925 height: 925
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 1 vertical: 1
controlID: 48 controlID: 38
draggingID: 0 draggingID: 0
--- !u!114 &10 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -235,20 +160,20 @@ MonoBehaviour: ...@@ -235,20 +160,20 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 11} - {fileID: 8}
- {fileID: 12} - {fileID: 9}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1348.5 width: 1201
height: 514 height: 457.5
m_MinSize: {x: 200, y: 50} m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
controlID: 39 controlID: 39
draggingID: 0 draggingID: 0
--- !u!114 &11 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -265,16 +190,16 @@ MonoBehaviour: ...@@ -265,16 +190,16 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 333 width: 296
height: 514 height: 457.5
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 13}
m_Panes: m_Panes:
- {fileID: 17} - {fileID: 13}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &12 --- !u!114 &9
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -289,19 +214,19 @@ MonoBehaviour: ...@@ -289,19 +214,19 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 333 x: 296
y: 0 y: 0
width: 1015.5 width: 905
height: 514 height: 457.5
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 18} - {fileID: 14}
- {fileID: 16} - {fileID: 12}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 1
--- !u!114 &13 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -317,19 +242,19 @@ MonoBehaviour: ...@@ -317,19 +242,19 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 514 y: 457.5
width: 1348.5 width: 1201
height: 411 height: 467.5
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 19} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 19} - {fileID: 15}
- {fileID: 20} - {fileID: 16}
- {fileID: 21} - {fileID: 17}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 1
--- !u!114 &14 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -344,74 +269,18 @@ MonoBehaviour: ...@@ -344,74 +269,18 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1348.5 x: 1201
y: 0 y: 0
width: 571.5 width: 509
height: 925 height: 925
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 22} m_ActualView: {fileID: 18}
m_Panes: m_Panes:
- {fileID: 22} - {fileID: 18}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &15 --- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 640, y: 580}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Build Settings
m_Image: {fileID: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 621
y: 230
width: 641
height: 581
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
m_SupportedDataModes:
isAutomatic: 1
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs:
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0}
m_SearchString:
--- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -426,7 +295,7 @@ MonoBehaviour: ...@@ -426,7 +295,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Simulator m_Text: "\u6A21\u62DF\u5668"
m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
...@@ -477,7 +346,7 @@ MonoBehaviour: ...@@ -477,7 +346,7 @@ MonoBehaviour:
screenIndex: 0 screenIndex: 0
networkReachability: 1 networkReachability: 1
systemLanguage: 10 systemLanguage: 10
--- !u!114 &17 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -492,15 +361,15 @@ MonoBehaviour: ...@@ -492,15 +361,15 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Hierarchy m_Text: "\u5C42\u7EA7"
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: -1 x: -1
y: 83 y: 93
width: 332 width: 295
height: 493 height: 436.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -514,25 +383,25 @@ MonoBehaviour: ...@@ -514,25 +383,25 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs: 186a0000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: c45dffff105effffce5fffff4c66ffff9866ffff7868ffff5875ffffa475ffff6e77ffffb87cffff047dfffff07effff8889ffffd489ffffbe8bffffee91ffff3a92ffff2694ffff8ef4ffffdaf4ffff88f6ffff2afbffffea620000ae840000b88e0000e28e0000fe8e0000108f0000508f0000988f0000b0930000da930000089400009094000092a1000058a20000 m_ExpandedIDs: 4ef2ffffacf2ffff0af3ffff74f3fffff2f3ffff26fbffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: PlatformCallback
m_OriginalName: m_OriginalName: PlatformCallback
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: 25970
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 11} m_ClientGUIView: {fileID: 8}
m_SearchString: m_SearchString:
m_ExpandedScenes: [] m_ExpandedScenes: []
m_CurrenRootInstanceID: 0 m_CurrenRootInstanceID: 0
...@@ -540,7 +409,7 @@ MonoBehaviour: ...@@ -540,7 +409,7 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593 m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &18 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -555,15 +424,15 @@ MonoBehaviour: ...@@ -555,15 +424,15 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Scene m_Text: "\u573A\u666F"
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 332 x: 295
y: 83 y: 93
width: 1013.5 width: 903
height: 493 height: 436.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1091,9 +960,9 @@ MonoBehaviour: ...@@ -1091,9 +960,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 101.899216, y: 302.4853, z: -5.3658557} m_Target: {x: 978.68414, y: 490.59204, z: -10.483236}
speed: 2 speed: 2
m_Value: {x: 101.899216, y: 302.4853, z: -5.3658557} m_Value: {x: 978.68414, y: 490.59204, z: -10.483236}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -1143,9 +1012,9 @@ MonoBehaviour: ...@@ -1143,9 +1012,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 663.0747 m_Target: 10
speed: 2 speed: 2
m_Value: 663.0747 m_Value: 10
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -1170,7 +1039,7 @@ MonoBehaviour: ...@@ -1170,7 +1039,7 @@ MonoBehaviour:
m_SceneVisActive: 1 m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0} m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0 m_ViewIsLockedToObject: 0
--- !u!114 &19 --- !u!114 &15
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1185,15 +1054,15 @@ MonoBehaviour: ...@@ -1185,15 +1054,15 @@ MonoBehaviour:
m_MinSize: {x: 230, y: 250} m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_TitleContent: m_TitleContent:
m_Text: Project m_Text: "\u9879\u76EE"
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: -1 x: -1
y: 597 y: 550.5
width: 1347.5 width: 1200
height: 390 height: 446.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1215,7 +1084,7 @@ MonoBehaviour: ...@@ -1215,7 +1084,7 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Plugins/Android/libs - Assets/Scenes
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ImportLogFlags: 0 m_ImportLogFlags: 0
...@@ -1223,16 +1092,16 @@ MonoBehaviour: ...@@ -1223,16 +1092,16 @@ MonoBehaviour:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Plugins/Android/libs - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: /Users/gr/Documents/UnityProject/Unity20251010Test m_LastProjectPath: /Users/fengchao/Desktop/UnityDemo
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 329c0000 m_SelectedIDs: be660000
m_LastClickedID: 39986 m_LastClickedID: 26302
m_ExpandedIDs: 000000002a5d00002c5d0000325d00009e8500002e9c0000 m_ExpandedIDs: 00000000a6660000a8660000aa660000ac660000ae66000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1248,7 +1117,7 @@ MonoBehaviour: ...@@ -1248,7 +1117,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 13} m_ClientGUIView: {fileID: 10}
m_SearchString: m_SearchString:
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
...@@ -1260,7 +1129,7 @@ MonoBehaviour: ...@@ -1260,7 +1129,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 000000002a5d00002c5d0000 m_ExpandedIDs: 00000000a6660000a8660000aa660000ac660000ae660000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1304,7 +1173,7 @@ MonoBehaviour: ...@@ -1304,7 +1173,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 10}
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
...@@ -1316,7 +1185,7 @@ MonoBehaviour: ...@@ -1316,7 +1185,7 @@ MonoBehaviour:
m_GridSize: 64 m_GridSize: 64
m_SkipHiddenPackages: 0 m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207 m_DirectoriesAreaWidth: 207
--- !u!114 &20 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1331,15 +1200,15 @@ MonoBehaviour: ...@@ -1331,15 +1200,15 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Console m_Text: "\u63A7\u5236\u53F0"
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1 x: -1
y: 620 y: 607.5
width: 1347.5 width: 1200
height: 367 height: 389.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1350,7 +1219,7 @@ MonoBehaviour: ...@@ -1350,7 +1219,7 @@ MonoBehaviour:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
m_SaveData: [] m_SaveData: []
m_OverlaysVisible: 1 m_OverlaysVisible: 1
--- !u!114 &21 --- !u!114 &17
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1385,7 +1254,7 @@ MonoBehaviour: ...@@ -1385,7 +1254,7 @@ MonoBehaviour:
m_SaveData: [] m_SaveData: []
m_OverlaysVisible: 1 m_OverlaysVisible: 1
mForceToReOpen: 0 mForceToReOpen: 0
--- !u!114 &22 --- !u!114 &18
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1400,14 +1269,14 @@ MonoBehaviour: ...@@ -1400,14 +1269,14 @@ MonoBehaviour:
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Inspector m_Text: "\u68C0\u67E5\u5668"
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1347.5 x: 1200
y: 83 y: 93
width: 570.5 width: 508
height: 904 height: 904
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment