范川铭

1.同步一下

@@ -79,6 +79,7 @@ public class GameCheck : MonoBehaviour @@ -79,6 +79,7 @@ public class GameCheck : MonoBehaviour
79 StartCoroutine(HttpsManager.Instance.GetRequest(getUrl, 79 StartCoroutine(HttpsManager.Instance.GetRequest(getUrl,
80 (req) => 80 (req) =>
81 { 81 {
  82 + // 赋值配置项
82 GameConfig.GameInfo = Tools.DeserializeObject<SGameInfo>(req); 83 GameConfig.GameInfo = Tools.DeserializeObject<SGameInfo>(req);
83 Debug.Log(GameConfig.GameInfo); 84 Debug.Log(GameConfig.GameInfo);
84 }, 85 },
@@ -27,13 +27,13 @@ EditorUserSettings: @@ -27,13 +27,13 @@ EditorUserSettings:
27 value: 53530557030c5b5f5d0c097212715d44144f1d7f752d2565282c4f66e3b8373b 27 value: 53530557030c5b5f5d0c097212715d44144f1d7f752d2565282c4f66e3b8373b
28 flags: 0 28 flags: 0
29 RecentlyUsedSceneGuid-7: 29 RecentlyUsedSceneGuid-7:
30 - value: 07540351030151095c575821167a5944444f1a737d7b7663787a1835b4b5373e 30 + value: 5106015653565c0d080d597140755d444f4f407f7d7920357b704961b1b0643a
31 flags: 0 31 flags: 0
32 RecentlyUsedSceneGuid-8: 32 RecentlyUsedSceneGuid-8:
33 - value: 5106015653565c0d080d597140755d444f4f407f7d7920357b704961b1b0643a 33 + value: 5109510754535d0854575b2741200d444e4e1a7c7b2a71342c7e4967b2b4623d
34 flags: 0 34 flags: 0
35 RecentlyUsedSceneGuid-9: 35 RecentlyUsedSceneGuid-9:
36 - value: 5109510754535d0854575b2741200d444e4e1a7c7b2a71342c7e4967b2b4623d 36 + value: 07540351030151095c575821167a5944444f1a737d7b7663787a1835b4b5373e
37 flags: 0 37 flags: 0
38 vcSharedLogLevel: 38 vcSharedLogLevel:
39 value: 0d5e400f0650 39 value: 0d5e400f0650
@@ -19,7 +19,7 @@ MonoBehaviour: @@ -19,7 +19,7 @@ MonoBehaviour:
19 width: 2560 19 width: 2560
20 height: 1357.3334 20 height: 1357.3334
21 m_ShowMode: 4 21 m_ShowMode: 4
22 - m_Title: Hierarchy 22 + m_Title: Project
23 m_RootView: {fileID: 2} 23 m_RootView: {fileID: 2}
24 m_MinSize: {x: 875, y: 300} 24 m_MinSize: {x: 875, y: 300}
25 m_MaxSize: {x: 10000, y: 10000} 25 m_MaxSize: {x: 10000, y: 10000}
@@ -120,7 +120,7 @@ MonoBehaviour: @@ -120,7 +120,7 @@ MonoBehaviour:
120 m_MinSize: {x: 300, y: 100} 120 m_MinSize: {x: 300, y: 100}
121 m_MaxSize: {x: 24288, y: 16192} 121 m_MaxSize: {x: 24288, y: 16192}
122 vertical: 0 122 vertical: 0
123 - controlID: 244 123 + controlID: 15
124 draggingID: 0 124 draggingID: 0
125 --- !u!114 &6 125 --- !u!114 &6
126 MonoBehaviour: 126 MonoBehaviour:
@@ -146,7 +146,7 @@ MonoBehaviour: @@ -146,7 +146,7 @@ MonoBehaviour:
146 m_MinSize: {x: 100, y: 100} 146 m_MinSize: {x: 100, y: 100}
147 m_MaxSize: {x: 8096, y: 16192} 147 m_MaxSize: {x: 8096, y: 16192}
148 vertical: 1 148 vertical: 1
149 - controlID: 132 149 + controlID: 16
150 draggingID: 0 150 draggingID: 0
151 --- !u!114 &7 151 --- !u!114 &7
152 MonoBehaviour: 152 MonoBehaviour:
@@ -158,7 +158,7 @@ MonoBehaviour: @@ -158,7 +158,7 @@ MonoBehaviour:
158 m_Enabled: 1 158 m_Enabled: 1
159 m_EditorHideFlags: 1 159 m_EditorHideFlags: 1
160 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} 160 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
161 - m_Name: AssetStoreWindow 161 + m_Name: SceneView
162 m_EditorClassIdentifier: 162 m_EditorClassIdentifier:
163 m_Children: [] 163 m_Children: []
164 m_Position: 164 m_Position:
@@ -167,15 +167,15 @@ MonoBehaviour: @@ -167,15 +167,15 @@ MonoBehaviour:
167 y: 0 167 y: 0
168 width: 1292 168 width: 1292
169 height: 682 169 height: 682
170 - m_MinSize: {x: 456, y: 375} 170 + m_MinSize: {x: 201, y: 221}
171 m_MaxSize: {x: 4001, y: 4021} 171 m_MaxSize: {x: 4001, y: 4021}
172 - m_ActualView: {fileID: 13} 172 + m_ActualView: {fileID: 14}
173 m_Panes: 173 m_Panes:
174 - {fileID: 14} 174 - {fileID: 14}
175 - {fileID: 15} 175 - {fileID: 15}
176 - {fileID: 13} 176 - {fileID: 13}
177 - m_Selected: 2  
178 - m_LastSelected: 1 177 + m_Selected: 0
  178 + m_LastSelected: 2
179 --- !u!114 &8 179 --- !u!114 &8
180 MonoBehaviour: 180 MonoBehaviour:
181 m_ObjectHideFlags: 52 181 m_ObjectHideFlags: 52
@@ -226,7 +226,7 @@ MonoBehaviour: @@ -226,7 +226,7 @@ MonoBehaviour:
226 m_MinSize: {x: 100, y: 100} 226 m_MinSize: {x: 100, y: 100}
227 m_MaxSize: {x: 8096, y: 16192} 227 m_MaxSize: {x: 8096, y: 16192}
228 vertical: 1 228 vertical: 1
229 - controlID: 191 229 + controlID: 57
230 draggingID: 0 230 draggingID: 0
231 --- !u!114 &10 231 --- !u!114 &10
232 MonoBehaviour: 232 MonoBehaviour:
@@ -749,9 +749,9 @@ MonoBehaviour: @@ -749,9 +749,9 @@ MonoBehaviour:
749 m_PlayAudio: 0 749 m_PlayAudio: 0
750 m_AudioPlay: 0 750 m_AudioPlay: 0
751 m_Position: 751 m_Position:
752 - m_Target: {x: 784.90393, y: 472.3755, z: -1.2112993} 752 + m_Target: {x: 910.17395, y: 626.6933, z: -2.5525517}
753 speed: 2 753 speed: 2
754 - m_Value: {x: 961.04877, y: 479.5093, z: -0.20217133} 754 + m_Value: {x: 910.17395, y: 626.6933, z: -2.5525517}
755 m_RenderMode: 0 755 m_RenderMode: 0
756 m_CameraMode: 756 m_CameraMode:
757 drawMode: 0 757 drawMode: 0
@@ -799,11 +799,11 @@ MonoBehaviour: @@ -799,11 +799,11 @@ MonoBehaviour:
799 m_Rotation: 799 m_Rotation:
800 m_Target: {x: -0.0071905754, y: -0.0035052756, z: -0.000025474808, w: 0.9999826} 800 m_Target: {x: -0.0071905754, y: -0.0035052756, z: -0.000025474808, w: 0.9999826}
801 speed: 2 801 speed: 2
802 - m_Value: {x: 0.015107922, y: 0.982547, z: 0.16077192, w: -0.09233392} 802 + m_Value: {x: 0.0071905754, y: 0.0035052754, z: 0.000025474807, w: -0.99998254}
803 m_Size: 803 m_Size:
804 - m_Target: 201.43204 804 + m_Target: 799.1802
805 speed: 2 805 speed: 2
806 - m_Value: 35.840363 806 + m_Value: 799.1802
807 m_Ortho: 807 m_Ortho:
808 m_Target: 0 808 m_Target: 0
809 speed: 2 809 speed: 2
@@ -997,9 +997,9 @@ MonoBehaviour: @@ -997,9 +997,9 @@ MonoBehaviour:
997 m_SceneHierarchy: 997 m_SceneHierarchy:
998 m_TreeViewState: 998 m_TreeViewState:
999 scrollPos: {x: 0, y: 0} 999 scrollPos: {x: 0, y: 0}
1000 - m_SelectedIDs: 1000 + m_SelectedIDs: 985b0000
1001 m_LastClickedID: 0 1001 m_LastClickedID: 0
1002 - m_ExpandedIDs: 10e5feff8054ffff3479ffff9e6f0000 1002 + m_ExpandedIDs: 2cfbffff
1003 m_RenameOverlay: 1003 m_RenameOverlay:
1004 m_UserAcceptedRename: 0 1004 m_UserAcceptedRename: 0
1005 m_Name: 1005 m_Name:
@@ -1068,7 +1068,7 @@ MonoBehaviour: @@ -1068,7 +1068,7 @@ MonoBehaviour:
1068 m_SkipHidden: 0 1068 m_SkipHidden: 0
1069 m_SearchArea: 1 1069 m_SearchArea: 1
1070 m_Folders: 1070 m_Folders:
1071 - - Assets/resources/Prefab 1071 + - Assets
1072 m_Globs: [] 1072 m_Globs: []
1073 m_OriginalText: 1073 m_OriginalText:
1074 m_ImportLogFlags: 0 1074 m_ImportLogFlags: 0
@@ -1084,7 +1084,7 @@ MonoBehaviour: @@ -1084,7 +1084,7 @@ MonoBehaviour:
1084 scrollPos: {x: 0, y: 0} 1084 scrollPos: {x: 0, y: 0}
1085 m_SelectedIDs: fe390000 1085 m_SelectedIDs: fe390000
1086 m_LastClickedID: 14846 1086 m_LastClickedID: 14846
1087 - m_ExpandedIDs: 000000005e6f000000ca9a3b 1087 + m_ExpandedIDs: 00000000985b0000
1088 m_RenameOverlay: 1088 m_RenameOverlay:
1089 m_UserAcceptedRename: 0 1089 m_UserAcceptedRename: 0
1090 m_Name: 1090 m_Name:
@@ -1112,7 +1112,7 @@ MonoBehaviour: @@ -1112,7 +1112,7 @@ MonoBehaviour:
1112 scrollPos: {x: 0, y: 0} 1112 scrollPos: {x: 0, y: 0}
1113 m_SelectedIDs: 1113 m_SelectedIDs:
1114 m_LastClickedID: 0 1114 m_LastClickedID: 0
1115 - m_ExpandedIDs: 9a42ffffffffffff000000005e6f000000ca9a3b 1115 + m_ExpandedIDs: ffffffff00000000985b0000
1116 m_RenameOverlay: 1116 m_RenameOverlay:
1117 m_UserAcceptedRename: 0 1117 m_UserAcceptedRename: 0
1118 m_Name: 1118 m_Name: