yuqucheng/killapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debug

Browse Source
This commit is contained in:
“虞渠成” 2026-06-25 10:43:57 +08:00
parent e69d3e4cbb
commit 5e67d38bd2
23 changed files with 287 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Assets/Res/language/language.json
View File

@ -37,7 +37,7 @@
{
"key": "100008",
"zh": "请输入邮箱地址",
"en": "Please enter email address"
"en": "Please enter your email address"
},
{
"key": "100009",
@ -52,7 +52,7 @@
{
"key": "100011",
"zh": "同意并继续",
"en": "Agree and continue"
"en": "Agree and Continue"
},
{
"key": "100012",
@ -62,17 +62,17 @@
{
"key": "100013",
"zh": "邮件已发送至：",
"en": "Email has been sent: "
"en": "Email sent to:"
},
{
"key": "100014",
"zh": "{0}秒后重新发送验证码",
"en": "Resend in {0} seconds"
"en": "Resend verification code in {0} seconds"
},
{
"key": "100015",
"zh": "重新发送验证码",
"en": "Send again"
"en": "Resend"
},
{
"key": "100016",
@ -122,7 +122,7 @@
{
"key": "100025",
"zh": "密码包含6位数字",
"en": "The password contains 6 digits"
"en": "Password must contain 6 digits"
},
{
"key": "100026",
@ -142,7 +142,7 @@
{
"key": "100029",
"zh": "复杂密码需同时包含6-16位数字、字母和字符",
"en": "Strong password must be 6-16 characters and include letters,\nnumbers, and symbols"
"en": "Strong password must be 6-16 characters including letters, \nnumbers, and symbols"
},
{
"key": "100030",
@ -172,22 +172,22 @@
{
"key": "100035",
"zh": "该邮箱未注册，请先注册账号",
"en": "This email is not registered. Please sign up"
"en": "This email is not registered. Please sign up first."
},
{
"key": "100036",
"zh": "网络连接不稳定，请检查后重试",
"en": "Network is unstable. Please try again"
"en": "Network connection is unstable. Please try again."
},
{
"key": "100037",
"zh": "再次返回退出应用",
"en": "Exit application again"
"en": "Press again to exit the app"
},
{
"key": "100038",
"zh": "登录已过期，请重新登录",
"en": "Login expired. Please login again"
"en": "Login expired. Please sign in again."
},
{
"key": "100039",
@ -197,7 +197,7 @@
{
"key": "100040",
"zh": "账号或密码错误，请重试",
"en": "Incorrect username or password. Please try again"
"en": "Incorrect account or password. Please try again."
},
{
"key": "100041",
@ -212,7 +212,7 @@
{
"key": "100043",
"zh": "绑定设备",
"en": "Connect a Device"
"en": "Connect Device"
},
{
"key": "100044",
@ -237,12 +237,12 @@
{
"key": "100048",
"zh": "我已经完成了安全培训",
"en": "I've completed the safety training"
"en": "I have completed the safety training"
},
{
"key": "100049",
"zh": "安全培训视频",
"en": "Safety training videos"
"en": "Safety Training Videos"
},
{
"key": "100050",
@ -252,7 +252,7 @@
{
"key": "100051",
"zh": "我已了解测试说明中的所有注意事项",
"en": "I have read and understood all the instructions and precautions in this guide"
"en": "I have read and understood all the precautions in the instructions"
},
{
"key": "100052",
@ -292,7 +292,7 @@
{
"key": "100059",
"zh": "恭喜你完成了所有安全测试问题！",
"en": "Congratulations! You have completed all the safety test questions"
"en": "Congratulations! You have completed all safety test questions!"
},
{
"key": "100060",
@ -307,27 +307,27 @@
{
"key": "100062",
"zh": "安全测试资源加载失败，请稍后重试",
"en": "Failed to load the safety test resources. Please try again later"
"en": "Failed to load safety test resources. Please try again later."
},
{
"key": "100063",
"zh": "恭喜你已经学习完了所有视频教程，正确回答完以下15道选择题即可成为合格的使用者。\n答题规则：\n1.回答正确自动跳到下一道题\n2.回答错误会先进行答案解析，并播放相关视频，然后继续答题\n3.接下来的题目还会涉及到已经答过的题目\n4.回答错误的题目会打乱答案顺序继续回答，直至回答正确所有题目才算合格\n例如：第3题错误，原先应该依次出现4~15的题目，出现错误后，接下来1~15的题目都会打乱顺序依次出现，直至能一次性正确回答所有问题\n5.已经回答正确两遍的题目可以不再出现",
"en": "Congratulations! You have completed all the video tutorials. You will become a qualified user once you have answered the following 15 multiple-choice questions correctly.\n\nAnswering rules:\n• A correct answer will automatically advance to the next question.\n• If you answer incorrectly, the answer will be explained, and a related video will be played before you can continue answering thequestion.\n• The following questions will also include those that you have already answered.\n• Answering a question incorrectly will scramble the answer order, and you must continue answering until you answer all questions correctly to pass.\nFor example: If question 3 is answered incorrectly, questions 4 through 15, which were originally supposed to appear sequentially, will appear in a shuffled order after the error, until all questions can be answered correctly in one go.\n• Questions that have already been answered correctly twice will not appear again."
"en": "Congratulations! You have completed all video tutorials. Correctly answer the following 15 multiple-choice questions to become a qualified user.\n\nAnswering rules:\n1. A correct answer will automatically advance to the next question.\n2. An incorrect answer will first show the explanation and play the relevant video, then continue.\n3. Subsequent questions will also include previously answered ones.\n4. Incorrectly answered questions will have their answer order scrambled; you must answer correctly to pass.\nExample: If question 3 is wrong, questions 4-15 that would have appeared in order will now appear in shuffled order until all can be answered correctly in one pass.\n5. Questions answered correctly twice in a row will no longer appear."
},
{
"key": "100064",
"zh": "全屏播放",
"en": "maximized view"
"en": "Full-Screen Playback"
},
{
"key": "100065",
"zh": "扫描二维码",
"en": "Scan the QR Code"
"en": "Scan QR Code"
},
{
"key": "100066",
"zh": "找到设备屏幕二维码，并将其放置在上方摄像头视野范围内。",
"en": "Locate the QR code on the device screen and place it within the camera frame above"
"en": "Locate the QR code on the device screen and place it within the camera frame above."
},
{
"key": "100067",
@ -342,7 +342,7 @@
{
"key": "100069",
"zh": "请确保设备的蓝牙已开启，且您就在附近。",
"en": "Please ensure that the device's Bluetooth is turned on and that you are nearby."
"en": "Please ensure the device's Bluetooth is turned on and you are nearby."
},
{
"key": "100070",
@ -911,17 +911,17 @@
},
{
"key": "100183",
"zh": "你好",
"zh": "Hello",
"en": "Hello"
},
{
"key": "100184",
"zh": "再见",
"zh": "Goodbye",
"en": "Goodbye"
},
{
"key": "100185",
"zh": "测试",
"zh": "Test",
"en": "Test"
},
{

BIN
Assets/Res/ui/common/头像遮罩.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

127
Assets/Res/ui/common/头像遮罩.png.meta Normal file
View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 9a825476c97d8e54faa98312fdb09c0d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Res/ui/selfpage/Group 111.png → Assets/Res/ui/common/默认头像.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
Assets/Res/ui/selfpage/Group 111.png.meta → Assets/Res/ui/common/默认头像.png.meta
View File

4
Assets/Res/ui/deviceinfopage/视频和音效.prefab
View File

@ -2948,7 +2948,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7174140159888755812
RectTransform:
m_ObjectHideFlags: 0
@ -3549,7 +3549,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3}
m_Name:
m_EditorClassIdentifier:
textKey: 100163
textKey: 100164
--- !u!1 &4619960850209599113
GameObject:
m_ObjectHideFlags: 0

8
Assets/Res/ui/deviceinfopage/设备用户管理.prefab
View File

@ -187,7 +187,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -687,7 +687,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
@ -842,7 +842,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -935,7 +935,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0

6
Assets/Res/ui/homepage/homePage.prefab
View File

@ -3962,7 +3962,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -193}
m_SizeDelta: {x: 50, y: 30}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1523837147955351397
CanvasRenderer:
@ -12585,7 +12585,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -193}
m_SizeDelta: {x: 50, y: 30}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 1, y: 1}
--- !u!222 &5438812739731702854
CanvasRenderer:
@ -16596,7 +16596,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -193}
m_SizeDelta: {x: 50, y: 30}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 1, y: 1}
--- !u!222 &532533115172051553
CanvasRenderer:

122
Assets/Res/ui/homepage/定时任务.prefab
View File

@ -278,10 +278,10 @@ RectTransform:
- {fileID: 3737288075933640946}
m_Father: {fileID: 8220346863834624436}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 160}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 375, y: -80}
m_SizeDelta: {x: 690, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1313901322799192810
CanvasRenderer:
@ -856,7 +856,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -936,7 +936,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -1184,7 +1184,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -1339,7 +1339,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -1507,7 +1507,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -1798,7 +1798,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -1921,7 +1921,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 12, y: 0}
m_SizeDelta: {x: 598, y: 30}
m_SizeDelta: {x: 598, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5146604714483224971
CanvasRenderer:
@ -1952,7 +1952,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
@ -2000,7 +2000,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -32}
m_SizeDelta: {x: 479, y: 60}
m_SizeDelta: {x: 479, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8240528560879999953
CanvasRenderer:
@ -2031,8 +2031,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 48
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@ -2356,7 +2356,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -2556,7 +2556,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -2649,7 +2649,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -2889,7 +2889,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -3211,7 +3211,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -3633,7 +3633,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -3892,7 +3892,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -32}
m_SizeDelta: {x: 479, y: 60}
m_SizeDelta: {x: 479, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1075156042367215177
CanvasRenderer:
@ -3923,8 +3923,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 48
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@ -4878,7 +4878,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -5169,7 +5169,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -32}
m_SizeDelta: {x: 479, y: 60}
m_SizeDelta: {x: 479, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4252822691189414411
CanvasRenderer:
@ -5200,8 +5200,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 48
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@ -5400,7 +5400,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -5480,7 +5480,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -5572,7 +5572,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -6182,7 +6182,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -6262,7 +6262,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -6476,7 +6476,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -6886,7 +6886,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -6979,7 +6979,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -7193,7 +7193,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -7254,7 +7254,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -32}
m_SizeDelta: {x: 479, y: 60}
m_SizeDelta: {x: 479, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2028377192183770361
CanvasRenderer:
@ -7285,8 +7285,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 48
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@ -7637,7 +7637,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -8376,7 +8376,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -32}
m_SizeDelta: {x: 479, y: 60}
m_SizeDelta: {x: 479, y: 70}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6885924091441221739
CanvasRenderer:
@ -8407,8 +8407,8 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 48
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
@ -8835,7 +8835,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -8883,7 +8883,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 12, y: 0}
m_SizeDelta: {x: 598, y: 30}
m_SizeDelta: {x: 598, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5027372894568892736
CanvasRenderer:
@ -8914,7 +8914,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
@ -9041,7 +9041,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -9209,7 +9209,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -9270,7 +9270,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 12, y: 0}
m_SizeDelta: {x: 598, y: 30}
m_SizeDelta: {x: 598, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &1989753959361687602
CanvasRenderer:
@ -9301,7 +9301,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
@ -9502,7 +9502,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -9670,7 +9670,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -9731,7 +9731,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 12, y: 0}
m_SizeDelta: {x: 598, y: 30}
m_SizeDelta: {x: 598, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &2857021751637177260
CanvasRenderer:
@ -9762,7 +9762,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
@ -9842,7 +9842,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -9935,7 +9935,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -10071,7 +10071,7 @@ RectTransform:
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 12, y: 0}
m_SizeDelta: {x: 598, y: 30}
m_SizeDelta: {x: 598, y: 40}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3693497554136944141
CanvasRenderer:
@ -10102,7 +10102,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
@ -10257,7 +10257,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
@ -10502,7 +10502,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0

4
Assets/Res/ui/homepage/错误提示.prefab
View File

@ -215,7 +215,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 32
m_FontStyle: 1
m_BestFit: 0
@ -428,7 +428,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0

49
Assets/Res/ui/rankPage/rankPage.prefab
View File

@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3235293158992042511
RectTransform:
m_ObjectHideFlags: 0
@ -65,7 +65,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -168,6 +168,7 @@ MonoBehaviour:
countText: {fileID: 2806969745141173758}
avatar: {fileID: 9054009673176152533}
rankText: {fileID: 4008727878463189030}
normalAvatar: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
--- !u!1 &200819185583037446
GameObject:
m_ObjectHideFlags: 0
@ -235,7 +236,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: accf9cdd3bfc3184d8151a0b5b0b57e7, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -257,7 +258,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &263561578525360981
GameObject:
m_ObjectHideFlags: 0
@ -443,7 +444,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3177434279976124590
RectTransform:
m_ObjectHideFlags: 0
@ -491,7 +492,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -644,7 +645,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: accf9cdd3bfc3184d8151a0b5b0b57e7, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -666,7 +667,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &769479048878957084
GameObject:
m_ObjectHideFlags: 0
@ -1192,7 +1193,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2285689618875555717
RectTransform:
m_ObjectHideFlags: 0
@ -1240,7 +1241,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2079,7 +2080,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: accf9cdd3bfc3184d8151a0b5b0b57e7, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2101,7 +2102,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &3502124553010327751
GameObject:
m_ObjectHideFlags: 0
@ -2445,7 +2446,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &4510356706655900108
RectTransform:
m_ObjectHideFlags: 0
@ -2493,7 +2494,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2599,6 +2600,7 @@ MonoBehaviour:
countText: {fileID: 8644596810823149306}
avatar: {fileID: 6490267337167937841}
rankText: {fileID: 0}
normalAvatar: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
--- !u!1 &4206387083405333351
GameObject:
m_ObjectHideFlags: 0
@ -2799,7 +2801,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: accf9cdd3bfc3184d8151a0b5b0b57e7, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -2821,7 +2823,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &4303154661462586366
GameObject:
m_ObjectHideFlags: 0
@ -2994,6 +2996,7 @@ MonoBehaviour:
countText: {fileID: 2471426963108152164}
avatar: {fileID: 5169193787059025926}
rankText: {fileID: 0}
normalAvatar: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
--- !u!1 &4661586653791768227
GameObject:
m_ObjectHideFlags: 0
@ -3061,7 +3064,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: accf9cdd3bfc3184d8151a0b5b0b57e7, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3083,7 +3086,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &4698917048396427868
GameObject:
m_ObjectHideFlags: 0
@ -5079,7 +5082,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 375, y: -34}
m_AnchoredPosition: {x: 375, y: -358}
m_SizeDelta: {x: 750, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4158408527774079532
@ -5136,6 +5139,7 @@ MonoBehaviour:
countText: {fileID: 9178348755953589182}
avatar: {fileID: 3839179418638713441}
rankText: {fileID: 1721694165247586357}
normalAvatar: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
--- !u!1 &8802112352110948514
GameObject:
m_ObjectHideFlags: 0
@ -5268,7 +5272,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 375, y: -34}
m_AnchoredPosition: {x: 375, y: -250}
m_SizeDelta: {x: 750, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6025936054114137009
@ -5325,6 +5329,7 @@ MonoBehaviour:
countText: {fileID: 133052024788146866}
avatar: {fileID: 9056712257673433432}
rankText: {fileID: 0}
normalAvatar: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
--- !u!1 &8973715693704571952
GameObject:
m_ObjectHideFlags: 0
@ -5342,7 +5347,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5500959981311970161
RectTransform:
m_ObjectHideFlags: 0
@ -5390,7 +5395,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

2
Assets/Res/ui/safetylearningpage/题目.prefab
View File

@ -220,7 +220,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f4c31d68e7cd3454685bb4c132a52f58, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0

8
Assets/Res/ui/selfpage/selfpage.prefab
View File

@ -1847,7 +1847,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1869,7 +1869,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &6596522295582540913
GameObject:
m_ObjectHideFlags: 0
@ -1887,7 +1887,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5798171175249365818
RectTransform:
m_ObjectHideFlags: 0
@ -1935,7 +1935,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

8
Assets/Res/ui/selfpage/个人信息页.prefab
View File

@ -2774,7 +2774,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6321436441066909397
RectTransform:
m_ObjectHideFlags: 0
@ -2822,7 +2822,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
@ -3007,7 +3007,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -3029,7 +3029,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &9011230000689874873
GameObject:
m_ObjectHideFlags: 0

8
Assets/Res/ui/selfpage/二维码页面.prefab
View File

@ -378,7 +378,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1377726068398500317
RectTransform:
m_ObjectHideFlags: 0
@ -426,7 +426,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -503,7 +503,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0d079f740e6e9bf47a72b22445bc71cb, type: 3}
m_Sprite: {fileID: 21300000, guid: 9a825476c97d8e54faa98312fdb09c0d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -525,7 +525,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
m_ShowMaskGraphic: 0
--- !u!1 &5960943854365254335
GameObject:
m_ObjectHideFlags: 0

2
Assets/Res/ui/videopage/一条视频.prefab
View File

@ -193,7 +193,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}

1
Assets/Scenes/MainScene.unity
View File

@ -586,6 +586,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
AutoConnect: 0
ConnectionTimeout: 15
needBackHome: 1
--- !u!114 &609900195
MonoBehaviour:
m_ObjectHideFlags: 0

7
Assets/Scripts/Bluetooth/BluetoothManager.cs
View File

@ -127,7 +127,7 @@ namespace Kill.Bluetooth
Instance = null;
}
}
public bool needBackHome=true;
/// <summary>
/// 蓝牙断开后延迟跳回主页
/// </summary>
@ -135,7 +135,9 @@ namespace Kill.Bluetooth
{
IsConnected=false;
// 延迟一下确保主页能读到最新的 IsConnected 状态
if(needBackHome)
StartCoroutine(DelayedGoHome());
needBackHome=true;
}
private System.Collections.IEnumerator DelayedGoHome()
@ -883,8 +885,9 @@ namespace Kill.Bluetooth
/// 断开当前连接（带协议通知）
/// 先发送0x70断开命令给设备，再断开BLE连接
/// </summary>
public void Disconnect()
public void Disconnect(bool backHome=false)
{
needBackHome=backHome;
if (!IsConnected)
{
Log("当前没有连接的设备");

2
Assets/Scripts/UI/Pages/ConnectDevice/ConnectDevicePageCtrl.cs
View File

@ -101,7 +101,9 @@ public class ConnectDevicePageCtrl : MonoBehaviour
private void ShowErrorPage()
{
if(BluetoothManager.Instance.IsConnected)
{
BluetoothManager.Instance.Disconnect();
}
topBar.SetActive(false);
foreach(GameObject g in sonPages)
g.gameObject.SetActive(false);

10
Assets/Scripts/UI/Pages/Ranking/RankItem.cs
View File

@ -13,17 +13,17 @@ namespace Kill.UI.Pages
public Text countText;
public Image avatar;
public Text rankText;
public Sprite normalAvatar;
public void SetData(RankData data)
{
avatar.gameObject.SetActive(false);
avatar.sprite=normalAvatar;
nameText.text = data.nickname;
countText.text = data.kill_count.ToString();
if(string.IsNullOrEmpty(data.avatar))
if(!string.IsNullOrEmpty(data.avatar))
{
avatar.gameObject.SetActive(false);
}
else
NetworkCtrl.Instance.LoadImageToUIImageAsync(data.avatar, avatar);
}
if(rankText!=null)
{
if(data.rank<=0)

7
Assets/Scripts/UI/Pages/SelfPage/SelfInfoPage.cs
View File

@ -51,15 +51,10 @@ namespace Kill.UI.Pages
// 设置头像
if (userInfo.avatar != null)
{
await NetworkCtrl.Instance.LoadImageToUIRawImageAsync(userInfo.avatar, avatarImage);
avatarImage.gameObject.SetActive(true);
await NetworkCtrl.Instance.LoadImageToUIRawImageAsync(userInfo.avatar, avatarImage);
avatarImage.transform.parent.GetComponent<Mask>().showMaskGraphic = false;
}
else
{
avatarImage.gameObject.SetActive(false);
avatarImage.transform.parent.GetComponent<Mask>().showMaskGraphic = true;
}
}
if (nicknameText != null)

9
Assets/Scripts/UI/Pages/SelfPage/SelfPage.cs
View File

@ -68,15 +68,10 @@ namespace Kill.UI.Pages
avatarImage.gameObject.SetActive(false);
nicknameText.text = userInfo.username;
emailText.text = userInfo.email;
if (string.IsNullOrEmpty(userInfo.avatar))
if (!string.IsNullOrEmpty(userInfo.avatar))
{
avatarImage.gameObject.SetActive(false);
avatarImage.transform.parent.GetComponent<Mask>().showMaskGraphic=true;
}
else
{
await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage);
avatarImage.gameObject.SetActive(true);
await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage);
avatarImage.transform.parent.GetComponent<Mask>().showMaskGraphic=false;
}
}

9
Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs
View File

@ -24,15 +24,10 @@ namespace Kill.UI.Pages
emailText.text = userInfo.email;
userIdText.text = $"User ID: {userInfo.id}";
qrCodeGenerator.Generate(userInfo.id);
if (string.IsNullOrEmpty(userInfo.avatar))
if (!string.IsNullOrEmpty(userInfo.avatar))
{
avatarImage.gameObject.SetActive(false);
avatarImage.transform.parent.GetComponent<Mask>().showMaskGraphic=true;
}
else
{
await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage);
avatarImage.gameObject.SetActive(true);
await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage);
avatarImage.transform.parent.GetComponent<Mask>().showMaskGraphic=false;
}
}