Skip to content

GitLab

Commit 65a5bdac authored by gaorui's avatar gaorui
Browse files

Merge branch 'develop' into 'main' 

Develop

See merge request !15
parents aeb50288 24b5c5eb
Expand all Show whitespace changes
Inline Side-by-side
Assets/Plugins/.DS_Store
View file @ 65a5bdac
No preview for this file type
Assets/Scenes/SampleScene.unity
View file @ 65a5bdac
This diff is collapsed.
Assets/Scripts/.DS_Store
View file @ 65a5bdac
No preview for this file type
Assets/Scripts/demo/ui/ExitConfirmationDialog.cs 0 → 100644
View file @ 65a5bdac
using UnityEngine;
using UnityEngine.UI;
public class ExitConfirmationDialog : MonoBehaviour
{
public GameObject dialog; // Reference to the dialog panel
public Button confirmButton;
public Button cancelButton;
void Start()
{
// 初始化时不强制设置 dialog 状态，保持与 Inspector 设置一致
// 如果 dialog 未分配，则默认隐藏
if (dialog != null)
{
// 只在 dialog 已分配的情况下进行初始化
}
else
{
dialog = gameObject; // 默认使用自身 GameObject
}
// Set up button listeners
confirmButton.onClick.AddListener(OnConfirmExit);
cancelButton.onClick.AddListener(OnCancelExit);
// 确保初始隐藏
HideDialog();
}
// Method to show the dialog
public void ShowDialog()
{
try
{
UnityMainThreadDispatcher.Instance.Enqueue(() => {
if (dialog != null)
{
NativeLogger.I("[Unity Dialog]", $"SetActive 1 {dialog.activeSelf}");
dialog.SetActive(true);
NativeLogger.I("[Unity Dialog]", $"SetActive 2 {dialog.activeSelf}");
}
else
{
NativeLogger.I("[Unity Dialog]", "Dialog is null");
}
});
}
catch (System.Exception ex)
{
NativeLogger.I("[Unity Dialog]", $"SetActive true {ex.Message}");
}
}
// Method to hide the dialog
public void HideDialog()
{
try
{
UnityMainThreadDispatcher.Instance.Enqueue(() => {
if (dialog != null)
{
dialog.SetActive(false);
}
});
}
catch (System.Exception ex)
{
NativeLogger.I("[Unity Dialog]", $"SetActive false {ex.Message}");
}
}
// Method to handle confirm exit
public void OnConfirmExit()
{
Debug.Log("Exiting the application...");
// Exit the application
Application.Quit();
}
// Method to handle cancel exit
public void OnCancelExit()
{
Debug.Log("Exit canceled.");
// Hide the dialog
dialog.SetActive(false);
}
}
Assets/Scripts/demo/ui/ExitConfirmationDialog.cs.meta 0 → 100644
View file @ 65a5bdac
fileFormatVersion: 2
guid: e61a69e5f636041048817aea3af86d3f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/demo/ui/GameSdkManager.cs
View file @ 65a5bdac
......@@ -6,21 +6,42 @@ using UnityEngine;
public class GameManager : MonoBehaviour
{
public ExitConfirmationDialog exitDialog; // 在 Inspector 中设置
private bool isExiting = false; // 防止重复调用退出
private void Awake()
{
// 触发单例构造，内部会调用 PlatformCallback.SetListener(this)
var _ = HoolaiListener.Instance;
HoolaiListener.Instance.SetExitConfirmationDialog(exitDialog);
}
//Android 需监听返回事件，如果当前场景没有返回拦截了需调用 SDK 的退出接口
//Android 需监听返回事件，如果当前场景没有游戏业务处理了（比如拦截返回上一个场景，此时无需调用，但返回到顶级场景后继续返回需处理此逻辑）需调用 SDK 的退出接口
void Update()
{
if (Input.GetKey(KeyCode.Escape))
{
NativeLogger.I("Game_Unity_Log", "clicked Exit");
HandleExit();
}
}
private void HandleExit()
{
// 防止重复调用
if (isExiting) return;
isExiting = true;
NativeLogger.I("Game_Unity_Log", "clicked Exit");
HoolaiSdkManager.ExitGame();
// 延迟重置标志位，防止短时间内重复触发
Invoke("ResetExitFlag", 0.5f);
}
private void ResetExitFlag()
{
isExiting = false;
}
public void OnLoginBtnClicked()
......@@ -73,20 +94,87 @@ public class GameManager : MonoBehaviour
}
public void OnPayBtnClicked()
public void OnPayBtnClicked1()
{
NativeLogger.I("Game_Unity_Log", "clicked Pay");
// 1. 创建并填充对象
PayParams payParams = new PayParams
{
Amount = 100,// 单位：分
ItemId = "com.nekki.sf3.cn_1",
ItemName = "礼包0",
CallbackInfo = "123456_8888_987654321",
NotifyUrl = "",
Count = 1,
Currency = "CNY"
};
payParams.AddOptionalParameter("test", "daily_bonus");
payParams.AddOptionalParameter("player_id", "p-98765");
NativeLogger.I("Game_Unity_Log", $"clicked Exit jsonString: {payParams}");
HoolaiSdkManager.StartPay(payParams);
}
public void OnPayBtnClicked6()
{
NativeLogger.I("Game_Unity_Log", "clicked Pay");
// 1. 创建并填充对象
PayParams payParams = new PayParams
{
Amount = 600, // 单位：分
ItemId = "com.nekki.sf3.cn_6",
ItemName = "礼包1",
CallbackInfo = "123456_8888_987654321",
NotifyUrl = "",
Count = 1,
Currency = "CNY"
};
payParams.AddOptionalParameter("test", "daily_bonus");
payParams.AddOptionalParameter("player_id", "p-98765");
NativeLogger.I("Game_Unity_Log", $"clicked Exit jsonString: {payParams}");
HoolaiSdkManager.StartPay(payParams);
}
public void OnPayBtnClicked68()
{
NativeLogger.I("Game_Unity_Log", "clicked Pay");
// 1. 创建并填充对象
PayParams payParams = new PayParams
{
Amount = 6800,// 单位：分
ItemId = "com.nekki.sf3.ch_68",
ItemName = "礼包10",
CallbackInfo = "123456_8888_987654321",
NotifyUrl = "",
Count = 1,
Currency = "CNY"
};
payParams.AddOptionalParameter("test", "daily_bonus");
payParams.AddOptionalParameter("player_id", "p-98765");
NativeLogger.I("Game_Unity_Log", $"clicked Exit jsonString: {payParams}");
HoolaiSdkManager.StartPay(payParams);
}
public void OnPayBtnClicked128()
{
NativeLogger.I("Game_Unity_Log", "clicked Pay");
// 1. 创建并填充对象
PayParams payParams = new PayParams
{
Amount = 100,
ItemId = "sword_101",
ItemName = "钻石",
Amount = 12800,// 单位：分
ItemId = "com.nekki.sf3.cn_128",
ItemName = "礼包20",
CallbackInfo = "123456_8888_987654321",
NotifyUrl = "",
Count = 1,
Currency = "USD"
Currency = "CNY"
};
payParams.AddOptionalParameter("test", "daily_bonus");
payParams.AddOptionalParameter("player_id", "p-98765");
......
Assets/Scripts/demo/ui/HoolaiListener.cs
View file @ 65a5bdac
......@@ -9,6 +9,8 @@ public class HoolaiListener : IPlatformCallbackListener
//商品列表更新事件
public event Action<List<GoodsInfo>> OnGoodsListUpdated;
public ExitConfirmationDialog exitDialog;
public static HoolaiListener Instance
{
get
......@@ -27,6 +29,12 @@ public class HoolaiListener : IPlatformCallbackListener
PlatformCallback.SetListener(this);
}
// 初始化退出标准警告
public void SetExitConfirmationDialog(ExitConfirmationDialog dialog)
{
exitDialog = dialog; // 保存对话框实例
}
public void OnInitSuccess(InitResult result)
{
NativeLogger.I("Game_Unity_Callback", $"OnInitSuccess GameId:{result.gameId} channel:{result.channel} channelId:{result.channelId}");
......@@ -99,5 +107,13 @@ public class HoolaiListener : IPlatformCallbackListener
public void OnCustomExit()
{
NativeLogger.I("Game_Unity_Callback", $"OnCustomExit show Game Exit Dialog!");
if (exitDialog != null)
{
exitDialog.ShowDialog(); // 显示确认对话框
}
else
{
NativeLogger.I("Game_Unity_Callback", "ExitConfirmationDialog is not set!");
}
}
}
Assets/Scripts/sdk/core/PlatformCallback.cs
View file @ 65a5bdac
......@@ -38,11 +38,15 @@ public class GoodsInfo
public class PlatformCallback : MonoBehaviour
{
private static IPlatformCallbackListener _listener;
private string SDK_BUILD_VERSION = "1.1.0.0";
private string SDK_20251023 = "202510231755";
// 单例实现，确保只有一个接收器实例
public static PlatformCallback Instance { get; private set; }
void Awake()
{
Debug.Log($"[PlatformCallback] unity sdk version:{SDK_BUILD_VERSION} Build Time:{SDK_20251023}");
// 单例模式实现
if (Instance != null && Instance != this)
{
......@@ -59,7 +63,7 @@ public class PlatformCallback : MonoBehaviour
// 确保游戏对象名称与 Android 调用匹配
gameObject.name = "PlatformCallback";
NativeLogger.I("PlatformCallback", "[PlatformCallback] Initialized with GameObject name: " + gameObject.name);
NativeLogger.I("PlatformCallback", $"[PlatformCallback] Initialized with GameObject name: {gameObject.name}");
}
public static void SetListener(IPlatformCallbackListener listener)
......
Packages/manifest.json
View file @ 65a5bdac
......@@ -11,6 +11,7 @@
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.purchasing": "4.11.0",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.7",
"com.unity.timeline": "1.7.7",
......
Packages/packages-lock.json
View file @ 65a5bdac
......@@ -117,6 +117,19 @@
"dependencies": {},
"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": {
"version": "6.0.3",
"depth": 1,
......@@ -130,7 +143,7 @@
},
"com.unity.services.core": {
"version": "1.14.0",
"depth": 2,
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.androidjni": "1.0.0",
......
UserSettings/Layouts/default-2022.dwlt
View file @ 65a5bdac
......@@ -14,17 +14,92 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: -1
y: 63
x: 828
y: 232
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:
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: 0
y: 53
width: 1710
height: 975
m_ShowMode: 4
m_Title: "\u9879\u76EE"
m_RootView: {fileID: 2}
m_Title: Project
m_RootView: {fileID: 5}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1
--- !u!114 &2
--- !u!114 &3
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: 159
draggingID: 0
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -37,9 +112,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
- {fileID: 5}
- {fileID: 4}
- {fileID: 6}
- {fileID: 8}
- {fileID: 7}
m_Position:
serializedVersion: 2
x: 0
......@@ -52,7 +127,7 @@ MonoBehaviour:
m_TopViewHeight: 30
m_UseBottomView: 1
m_BottomViewHeight: 20
--- !u!114 &3
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -74,7 +149,7 @@ MonoBehaviour:
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
m_LastLoadedLayoutName:
--- !u!114 &4
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -95,7 +170,7 @@ MonoBehaviour:
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
--- !u!114 &5
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -108,8 +183,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 6}
- {fileID: 11}
- {fileID: 9}
- {fileID: 14}
m_Position:
serializedVersion: 2
x: 0
......@@ -121,7 +196,7 @@ MonoBehaviour:
vertical: 0
controlID: 37
draggingID: 0
--- !u!114 &6
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -134,8 +209,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 7}
- {fileID: 10}
- {fileID: 13}
m_Position:
serializedVersion: 2
x: 0
......@@ -147,7 +222,7 @@ MonoBehaviour:
vertical: 1
controlID: 38
draggingID: 0
--- !u!114 &7
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -160,8 +235,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 8}
- {fileID: 9}
- {fileID: 11}
- {fileID: 12}
m_Position:
serializedVersion: 2
x: 0
......@@ -173,7 +248,7 @@ MonoBehaviour:
vertical: 0
controlID: 39
draggingID: 0
--- !u!114 &8
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -194,12 +269,12 @@ MonoBehaviour:
height: 457.5
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 13}
- {fileID: 17}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &9
--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -218,15 +293,15 @@ MonoBehaviour:
y: 0
width: 905
height: 457.5
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 14}
- {fileID: 12}
- {fileID: 18}
- {fileID: 16}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &10
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -247,14 +322,14 @@ MonoBehaviour:
height: 467.5
m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 15}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 15}
- {fileID: 16}
- {fileID: 17}
- {fileID: 19}
- {fileID: 20}
- {fileID: 21}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &11
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -273,14 +348,70 @@ MonoBehaviour:
y: 0
width: 509
height: 925
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18}
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 22}
m_Panes:
- {fileID: 18}
- {fileID: 22}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &12
--- !u!114 &15
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: 828
y: 232
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:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -295,7 +426,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u6A21\u62DF\u5668"
m_Text: Simulator
m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
......@@ -346,7 +477,7 @@ MonoBehaviour:
screenIndex: 0
networkReachability: 1
systemLanguage: 10
--- !u!114 &13
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -361,13 +492,13 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u5C42\u7EA7"
m_Text: Hierarchy
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -1
y: 93
x: 0
y: 83
width: 295
height: 436.5
m_SerializedDataModeController:
......@@ -383,25 +514,25 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 186a0000
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 4ef2ffffacf2ffff0af3ffff74f3fffff2f3ffff26fbffff
m_ExpandedIDs: 22fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: PlatformCallback
m_OriginalName: PlatformCallback
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 25970
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 8}
m_ClientGUIView: {fileID: 11}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
......@@ -409,7 +540,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &14
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -424,13 +555,13 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u573A\u666F"
m_Text: Scene
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 295
y: 93
x: 296
y: 83
width: 903
height: 436.5
m_SerializedDataModeController:
......@@ -960,9 +1091,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 978.68414, y: 490.59204, z: -10.483236}
m_Target: {x: 720, y: 240, z: 0}
speed: 2
m_Value: {x: 978.68414, y: 490.59204, z: -10.483236}
m_Value: {x: 720, y: 240, z: 0}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -1012,9 +1143,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 10
m_Target: 788.76105
speed: 2
m_Value: 10
m_Value: 788.76105
m_Ortho:
m_Target: 1
speed: 2
......@@ -1039,7 +1170,7 @@ MonoBehaviour:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &15
--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -1054,13 +1185,13 @@ MonoBehaviour:
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: "\u9879\u76EE"
m_Text: Project
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -1
y: 550.5
x: 0
y: 540.5
width: 1200
height: 446.5
m_SerializedDataModeController:
......@@ -1084,7 +1215,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scenes
- Assets/Scripts/sdk/core
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
......@@ -1092,16 +1223,16 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scenes
- Assets/Scripts/sdk/core
m_LastFoldersGridSize: -1
m_LastProjectPath: /Users/fengchao/Desktop/UnityDemo
m_LastProjectPath: /Users/gr/Documents/unity-work/UnityDemo
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: be660000
m_LastClickedID: 26302
m_ExpandedIDs: 00000000a6660000a8660000aa660000ac660000ae66000000ca9a3b
m_SelectedIDs: 2c670000
m_LastClickedID: 26412
m_ExpandedIDs: 00000000106700001e67000028670000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -1117,7 +1248,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 10}
m_ClientGUIView: {fileID: 13}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
......@@ -1129,7 +1260,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000a6660000a8660000aa660000ac660000ae660000
m_ExpandedIDs: 0000000010670000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -1173,7 +1304,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 10}
m_ClientGUIView: {fileID: 13}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
......@@ -1185,7 +1316,7 @@ MonoBehaviour:
m_GridSize: 64
m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207
--- !u!114 &16
--- !u!114 &20
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -1200,15 +1331,15 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u63A7\u5236\u53F0"
m_Text: Console
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: -1
y: 607.5
x: 0
y: 540.5
width: 1200
height: 389.5
height: 446.5
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
......@@ -1219,7 +1350,7 @@ MonoBehaviour:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
--- !u!114 &17
--- !u!114 &21
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -1254,7 +1385,7 @@ MonoBehaviour:
m_SaveData: []
m_OverlaysVisible: 1
mForceToReOpen: 0
--- !u!114 &18
--- !u!114 &22
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -1269,13 +1400,13 @@ MonoBehaviour:
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u68C0\u67E5\u5668"
m_Text: Inspector
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 1200
y: 93
x: 1201
y: 83
width: 508
height: 904
m_SerializedDataModeController:
......
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