Commit 924ad669 authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/daily_20241109_fit'

# Conflicts:
#	assets/Bundles/HomeScene/HomeScene.scene
#	profiles/v2/packages/reference-image.json
parents ce69965c a8b31e34
......@@ -205,14 +205,14 @@
"_far": 2000,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 11,
"g": 5,
"b": 79,
"a": 255
},
"_depth": 1,
"_stencil": 0,
"_clearFlags": 6,
"_clearFlags": 7,
"_rect": {
"__type__": "cc.Rect",
"x": 0,
......
This diff is collapsed.
......@@ -192,14 +192,14 @@
"_far": 2000,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 11,
"g": 5,
"b": 79,
"a": 255
},
"_depth": 1,
"_stencil": 0,
"_clearFlags": 6,
"_clearFlags": 7,
"_rect": {
"__type__": "cc.Rect",
"x": 0,
......
......@@ -186,9 +186,9 @@
"_far": 2000,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 11,
"g": 5,
"b": 79,
"a": 255
},
"_depth": 1,
......
......@@ -49,6 +49,7 @@
-ms-user-select: none;
-khtml-user-select: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
background-color: #0b054f;
}
/* Remove spin of input type number */
......
......@@ -20,7 +20,7 @@
<script type="text/javascript" src="https://appx/web-view.min.js"></script>
</head>
<body style="overflow: hidden;">
<body style="overflow: hidden; background-color: #0b054f;">
<%- include(cocosToolBar, {config: config}) %>
<div id="content" class="content" style="overflow: hidden;">
<div class="contentWrap">
......
......@@ -3,7 +3,7 @@
"config": {
"images": [],
"sceneUUID": {},
"scene": "7b5de2a0-8504-46ba-9019-37a3548ce8e1"
"scene": "9e293cde-e27b-4902-808b-e884f3e9da32"
},
"show": false
}
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