Explorar o código

修改界面布局,检查音频,添加引导语音

“CSiCheng” hai 1 ano
pai
achega
46886c7797

+ 8 - 0
Assets/Audio/引导.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 782cd0b1dfae04944a9062bfe20d2d11
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
Assets/Audio/引导/引导1.MP3


+ 22 - 0
Assets/Audio/引导/引导1.MP3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e6e3f18738ef4434ea6a70501aca8902
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
Assets/Audio/引导/引导2.MP3


+ 22 - 0
Assets/Audio/引导/引导2.MP3.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 0cc19d85e8620534c8a8969abc493b7a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 594 - 68
Assets/Prefabs/WorldCanvas.prefab


+ 47 - 60
Assets/Scenes/Main.unity

@@ -1058,11 +1058,6 @@ Transform:
   m_Father: {fileID: 1663679541}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 50, y: -238.22699, z: 0}
---- !u!20 &631022169 stripped
-Camera:
-  m_CorrespondingSourceObject: {fileID: 5374442942190148195, guid: 7429b175130f24842803ffe5f563587d, type: 3}
-  m_PrefabInstance: {fileID: 769774872}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &686404610
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1233,6 +1228,26 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 5374442942190148193, guid: 7429b175130f24842803ffe5f563587d, type: 3}
+      propertyPath: m_PositionInput.m_Action.m_Id
+      value: 149c675b-aedd-43b1-8ac7-1fc24299e559
+      objectReference: {fileID: 0}
+    - target: {fileID: 5374442942190148193, guid: 7429b175130f24842803ffe5f563587d, type: 3}
+      propertyPath: m_RotationInput.m_Action.m_Id
+      value: cf7dcd08-b5fa-463f-84fb-f34af3a657a6
+      objectReference: {fileID: 0}
+    - target: {fileID: 5374442942190148193, guid: 7429b175130f24842803ffe5f563587d, type: 3}
+      propertyPath: m_PositionInput.m_Action.m_Name
+      value: Position Input
+      objectReference: {fileID: 0}
+    - target: {fileID: 5374442942190148193, guid: 7429b175130f24842803ffe5f563587d, type: 3}
+      propertyPath: m_RotationInput.m_Action.m_Name
+      value: Rotation Input
+      objectReference: {fileID: 0}
+    - target: {fileID: 5374442943249206179, guid: 7429b175130f24842803ffe5f563587d, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5374442944130642816, guid: 7429b175130f24842803ffe5f563587d, type: 3}
       propertyPath: m_RootOrder
       value: 2
@@ -1291,16 +1306,6 @@ PrefabInstance:
       objectReference: {fileID: 1553029249}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7429b175130f24842803ffe5f563587d, type: 3}
---- !u!1 &769774873 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5374442942741762705, guid: 7429b175130f24842803ffe5f563587d, type: 3}
-  m_PrefabInstance: {fileID: 769774872}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &769774874 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5374442943249206179, guid: 7429b175130f24842803ffe5f563587d, type: 3}
-  m_PrefabInstance: {fileID: 769774872}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &788137151
 GameObject:
   m_ObjectHideFlags: 0
@@ -2102,6 +2107,32 @@ Transform:
   m_Father: {fileID: 1555416738}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1679934104 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2367107365638546949, guid: 871a7b97842872a439ae9b9ce483209e, type: 3}
+  m_PrefabInstance: {fileID: 686404610}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &1679934105
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1679934104}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: f7568a42233dfc348bf4058e2bdcb01a, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1001 &1718513241
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2771,7 +2802,7 @@ PrefabInstance:
     - target: {fileID: 2496800144926742614, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
       propertyPath: animator
       value: 
-      objectReference: {fileID: 2048452213}
+      objectReference: {fileID: 1679934105}
     - target: {fileID: 2496800144954115908, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
       propertyPath: animator
       value: 
@@ -2824,10 +2855,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: WorldCanvas
       objectReference: {fileID: 0}
-    - target: {fileID: 4400771669138867730, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_Camera
-      value: 
-      objectReference: {fileID: 631022169}
     - target: {fileID: 4400771669138867733, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -2912,46 +2939,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
-      value: 
-      objectReference: {fileID: 769774874}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
-      value: 
-      objectReference: {fileID: 769774873}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: SetActive
-      objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
-      value: SetActive
-      objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
-      value: UnityEngine.GameObject, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5256516899290289149, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
     - target: {fileID: 8843562660769635650, guid: 2980ccc56dc596f498fa8bbd3b808cd9, type: 3}
       propertyPath: animator
       value: 

+ 8 - 0
Assets/教室/动画.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 90b245bf4976114458c0b5444897582a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 101 - 0
Assets/教室/动画/女-吵闹.controller

@@ -0,0 +1,101 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-2151941144217424511
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u5750"
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 1827226128182048838, guid: d1e549ad091226f48b430fd8f91522a5, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-1377793151367403732
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u5435\u95F9"
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 5425111047727897975, guid: d1e549ad091226f48b430fd8f91522a5, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "\u5973-\u5435\u95F9"
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 7237003574023894257}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &7237003574023894257
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2151941144217424511}
+    m_Position: {x: 180, y: 240, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -1377793151367403732}
+    m_Position: {x: 430, y: 250, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -2151941144217424511}

+ 8 - 0
Assets/教室/动画/女-吵闹.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f7568a42233dfc348bf4058e2bdcb01a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
Assets/界面拼图/BG.png


+ 121 - 0
Assets/界面拼图/BG.png.meta

@@ -0,0 +1,121 @@
+fileFormatVersion: 2
+guid: a4c097a8bfcdff14ab0f440bb4b93a70
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 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
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 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
+    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
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN=BIN
Assets/界面拼图/黑板.png


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio

粤ICP备19079148号