范川铭

1.同步一下

... ... @@ -79,6 +79,7 @@ public class GameCheck : MonoBehaviour
StartCoroutine(HttpsManager.Instance.GetRequest(getUrl,
(req) =>
{
// 赋值配置项
GameConfig.GameInfo = Tools.DeserializeObject<SGameInfo>(req);
Debug.Log(GameConfig.GameInfo);
},
... ...
... ... @@ -27,13 +27,13 @@ EditorUserSettings:
value: 53530557030c5b5f5d0c097212715d44144f1d7f752d2565282c4f66e3b8373b
flags: 0
RecentlyUsedSceneGuid-7:
value: 07540351030151095c575821167a5944444f1a737d7b7663787a1835b4b5373e
value: 5106015653565c0d080d597140755d444f4f407f7d7920357b704961b1b0643a
flags: 0
RecentlyUsedSceneGuid-8:
value: 5106015653565c0d080d597140755d444f4f407f7d7920357b704961b1b0643a
value: 5109510754535d0854575b2741200d444e4e1a7c7b2a71342c7e4967b2b4623d
flags: 0
RecentlyUsedSceneGuid-9:
value: 5109510754535d0854575b2741200d444e4e1a7c7b2a71342c7e4967b2b4623d
value: 07540351030151095c575821167a5944444f1a737d7b7663787a1835b4b5373e
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
... ...
... ... @@ -19,7 +19,7 @@ MonoBehaviour:
width: 2560
height: 1357.3334
m_ShowMode: 4
m_Title: Hierarchy
m_Title: Project
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
... ... @@ -120,7 +120,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 244
controlID: 15
draggingID: 0
--- !u!114 &6
MonoBehaviour:
... ... @@ -146,7 +146,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 132
controlID: 16
draggingID: 0
--- !u!114 &7
MonoBehaviour:
... ... @@ -158,7 +158,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: AssetStoreWindow
m_Name: SceneView
m_EditorClassIdentifier:
m_Children: []
m_Position:
... ... @@ -167,15 +167,15 @@ MonoBehaviour:
y: 0
width: 1292
height: 682
m_MinSize: {x: 456, y: 375}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
- {fileID: 15}
- {fileID: 13}
m_Selected: 2
m_LastSelected: 1
m_Selected: 0
m_LastSelected: 2
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
... ... @@ -226,7 +226,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 191
controlID: 57
draggingID: 0
--- !u!114 &10
MonoBehaviour:
... ... @@ -749,9 +749,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 784.90393, y: 472.3755, z: -1.2112993}
m_Target: {x: 910.17395, y: 626.6933, z: -2.5525517}
speed: 2
m_Value: {x: 961.04877, y: 479.5093, z: -0.20217133}
m_Value: {x: 910.17395, y: 626.6933, z: -2.5525517}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
... ... @@ -799,11 +799,11 @@ MonoBehaviour:
m_Rotation:
m_Target: {x: -0.0071905754, y: -0.0035052756, z: -0.000025474808, w: 0.9999826}
speed: 2
m_Value: {x: 0.015107922, y: 0.982547, z: 0.16077192, w: -0.09233392}
m_Value: {x: 0.0071905754, y: 0.0035052754, z: 0.000025474807, w: -0.99998254}
m_Size:
m_Target: 201.43204
m_Target: 799.1802
speed: 2
m_Value: 35.840363
m_Value: 799.1802
m_Ortho:
m_Target: 0
speed: 2
... ... @@ -997,9 +997,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_SelectedIDs: 985b0000
m_LastClickedID: 0
m_ExpandedIDs: 10e5feff8054ffff3479ffff9e6f0000
m_ExpandedIDs: 2cfbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
... ... @@ -1068,7 +1068,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/resources/Prefab
- Assets
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
... ... @@ -1084,7 +1084,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: fe390000
m_LastClickedID: 14846
m_ExpandedIDs: 000000005e6f000000ca9a3b
m_ExpandedIDs: 00000000985b0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
... ... @@ -1112,7 +1112,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 9a42ffffffffffff000000005e6f000000ca9a3b
m_ExpandedIDs: ffffffff00000000985b0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
... ...