diff --git a/Assets/AI/AIController.cs b/Assets/AI/AIController.cs index b1e86752..4f014e04 100644 --- a/Assets/AI/AIController.cs +++ b/Assets/AI/AIController.cs @@ -190,7 +190,7 @@ public class AIController : MonoBehaviour if (speedTxt != null) { speedTxt.gameObject.SetActive(true); - string fullText = "��ӭ����ħ���ӳ���δ�����磬������׶�������ԴԴ���ϵ��������ǵ���أ�������Я��Ŭ������������磬�������Dz����ܵ��˺���"; + string fullText = "欢迎来到魔力队长的海底猎场,在这里我们将拿起手中的武器发射子弹,捕捉各类鱼种,越大的鱼种越难被捕捉，看看最终你会获得多少奖励吧，这可是有排名的呐。"; textDisplayCoroutine = StartCoroutine(DisplayTextCharByChar(fullText)); //�ȴ����ֿ�ʼ��ʾ���ٲ������� diff --git a/Assets/AI/Bip001.prefab b/Assets/AI/Bip001.prefab index a12a0b34..7789923d 100644 --- a/Assets/AI/Bip001.prefab +++ b/Assets/AI/Bip001.prefab @@ -446,7 +446,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7e9c9ba060174ae4996e2baf56ce4766, type: 3} m_Name: m_EditorClassIdentifier: - introAudio: {fileID: 8300000, guid: a195b3ca85252e847ace38540490ac46, type: 3} + introAudio: {fileID: 8300000, guid: f381811965b43e54fa4275a80b7bb179, type: 3} waveAnimationTrigger: Wave leaveAnimationTrigger: Leave rotationDuration: 1.5 diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 3cf7b6ff..e1d0b126 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from CHINAMI-UKDLSK3 at 2026/2/24 18:47:27 \ No newline at end of file +Build from ZTT at 2026/2/25 13:35:41 \ No newline at end of file diff --git a/Assets/_FishingMaster/Scripts/Manager/GameManager.cs b/Assets/_FishingMaster/Scripts/Manager/GameManager.cs index cd563e4c..2ea74d35 100644 --- a/Assets/_FishingMaster/Scripts/Manager/GameManager.cs +++ b/Assets/_FishingMaster/Scripts/Manager/GameManager.cs @@ -179,7 +179,7 @@ public class GameManager : MonoBehaviour public LoginInfo authInfo = new LoginInfo(); public List itemList = new List(); - + public LoginPanel log; //添加 [Header("AI角色")] public GameObject aiCharacterPre;//AI角色预制体 @@ -344,7 +344,7 @@ public class GameManager : MonoBehaviour public void GamePlay() { //修改处：创建AI角色 - // CreateAICharacter(); + CreateAICharacter(); // PlayerUIMessage(0); // CoroutineTaskManager.Instance.WaitSecondTodo(() => // AudioManager.Ins?.SoundPlay("bgm2", true), 10f); @@ -358,19 +358,20 @@ public class GameManager : MonoBehaviour //修改处：添加AI介绍完成后的游戏开始方法 public void StartGameAfterIntroduction() { + isAIIntroductionComplete = true; isGamePlay = true; - + Debug.Log("AI介绍完成，开始游戏正常流程"); + CreateGameStartPoint(); - //创建Boss PlayerUIMessage(0); } //修改处：添加创建AI角色的方法 - private void CreateAICharacter() + public void CreateAICharacter() { //检查是否已经存在AI角色 if (aiCharacter != null) @@ -384,7 +385,7 @@ public class GameManager : MonoBehaviour Debug.Log("创建AI角色"); //在玩家前方创建AI角色 - Vector3 spawnPosition = player.transform.position + player.transform.forward * 3f; + Vector3 spawnPosition =GameInit .Ins . startDoorPos.transform.position ; aiCharacter = Instantiate(aiCharacterPre, spawnPosition, Quaternion.identity); //获取AIController并启动开场白 diff --git a/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs b/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs index 25c3b37e..04806cd2 100644 --- a/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs +++ b/Assets/_FishingMaster/Scripts/UI/LoginPanel.cs @@ -154,8 +154,11 @@ public class LoginPanel : MonoBehaviour { RequestLoginCount = 0; WorldUIManager.Ins.Back(); - - GameManager.Ins.CreateGameStartPoint(); + CoroutineTaskManager.Instance.WaitSecondTodo(() => + { + GameManager.Ins.CreateAICharacter(); + }, 1); + } } diff --git a/Assets/sucai/吉祥物.fbm.meta b/Assets/sucai/吉祥物.fbm.meta new file mode 100644 index 00000000..c1bbc04b --- /dev/null +++ b/Assets/sucai/吉祥物.fbm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 402042a6dd4d36c48be375540f9576f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/sucai/吉祥物.fbm/tripo_image_fbb3a789_0(改）.jpg b/Assets/sucai/吉祥物.fbm/tripo_image_fbb3a789_0(改）.jpg new file mode 100644 index 00000000..7f64205e Binary files /dev/null and b/Assets/sucai/吉祥物.fbm/tripo_image_fbb3a789_0(改）.jpg differ diff --git a/Assets/sucai/吉祥物.fbm/tripo_image_fbb3a789_0(改）.jpg.meta b/Assets/sucai/吉祥物.fbm/tripo_image_fbb3a789_0(改）.jpg.meta new file mode 100644 index 00000000..52aed3c2 --- /dev/null +++ b/Assets/sucai/吉祥物.fbm/tripo_image_fbb3a789_0(改）.jpg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: bb0735d9579a8a648af38098d7e62850 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/sucai/走.FBX b/Assets/sucai/走.FBX new file mode 100644 index 00000000..d12f3216 Binary files /dev/null and b/Assets/sucai/走.FBX differ diff --git a/Assets/sucai/走.FBX.meta b/Assets/sucai/走.FBX.meta new file mode 100644 index 00000000..eca35a56 --- /dev/null +++ b/Assets/sucai/走.FBX.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: c01ceeca5f5d5cf4586a818ab9edd5e6 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 0ab77a1a..b9003776 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -21,7 +21,7 @@ "com.unity.xr.interaction.toolkit": "2.6.3", "com.unity.xr.management": "4.5.0", "com.unity.xr.openxr": "1.13.1", - "com.unity.xr.picoxr": "file:E:/Git2/FutureMen/SDK/UnityIntegrationSDK-2.4.0_B25-20230811-VSTCamera", + "com.unity.xr.picoxr": "file:../SDK/UnityIntegrationSDK-2.4.0_B25-20230811-VSTCamera", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 04554cde..7a2f8327 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -329,7 +329,7 @@ "url": "https://packages.unity.cn" }, "com.unity.xr.picoxr": { - "version": "file:E:/Git2/FutureMen/SDK/UnityIntegrationSDK-2.4.0_B25-20230811-VSTCamera", + "version": "file:../SDK/UnityIntegrationSDK-2.4.0_B25-20230811-VSTCamera", "depth": 0, "source": "local", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 507f53c7..168756c1 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -671,6 +671,7 @@ PlayerSettings: webGLPowerPreference: 2 scriptingDefineSymbols: Android: MIRROR;MIRROR_57_0_OR_NEWER;MIRROR_58_0_OR_NEWER;MIRROR_65_0_OR_NEWER;MIRROR_66_0_OR_NEWER;MIRROR_2022_9_OR_NEWER;MIRROR_2022_10_OR_NEWER;MIRROR_70_0_OR_NEWER;MIRROR_71_0_OR_NEWER;MIRROR_73_OR_NEWER;MIRROR_78_OR_NEWER;MIRROR_79_OR_NEWER;MIRROR_81_OR_NEWER;PICO;PHY3D_ENABLED;MULTIPLAYER_ENABLED;SHADER_API_GLES3;CURVY_SPLINES;CURVY_SPLINES_8_9_2 + Standalone: CURVY_SPLINES;CURVY_SPLINES_8_9_2 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: