|
|
@@ -39,7 +39,15 @@
|
|
|
"default",
|
|
|
"GameUI"
|
|
|
],
|
|
|
+<<<<<<< HEAD
|
|
|
+<<<<<<< HEAD
|
|
|
+ "last-module-event-record-time": 1645215058788,
|
|
|
+=======
|
|
|
+ "last-module-event-record-time": 1645746642523,
|
|
|
+>>>>>>> cba7e039f9979c7af0832b36f193289324b80096
|
|
|
+=======
|
|
|
"last-module-event-record-time": 1643366926685,
|
|
|
+>>>>>>> parent of cba7e03... 1、修改仓库界面
|
|
|
"simulator-orientation": false,
|
|
|
"simulator-resolution": {
|
|
|
"height": 640,
|
