diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem.meta b/EintooAR/Assets/AssetArt/AR/UI/Home.meta similarity index 77% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem.meta rename to EintooAR/Assets/AssetArt/AR/UI/Home.meta index 26c74153..a78e5f91 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem.meta +++ b/EintooAR/Assets/AssetArt/AR/UI/Home.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4e24d18095dde964a835aa9ee0220519 +guid: 2ee9401164255b345a664d27b49d7f6b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/EintooAR/Assets/AssetArt/AR/UI/Home/AR寻宠.png b/EintooAR/Assets/AssetArt/AR/UI/Home/AR寻宠.png new file mode 100644 index 00000000..314e9ce2 Binary files /dev/null and b/EintooAR/Assets/AssetArt/AR/UI/Home/AR寻宠.png differ diff --git a/EintooAR/Assets/AssetArt/AR/UI/Home/AR寻宠.png.meta b/EintooAR/Assets/AssetArt/AR/UI/Home/AR寻宠.png.meta new file mode 100644 index 00000000..31c73936 --- /dev/null +++ b/EintooAR/Assets/AssetArt/AR/UI/Home/AR寻宠.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 59fb04aa26a014948966c42f7811ca97 +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: 4 + 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: 4 + buildTarget: Win64 + 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: 4 + buildTarget: WebGL + 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: 4 + buildTarget: iOS + 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: 4 + 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: 4 + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/AssetArt/AR/UI/Home/首页-海报@3x.png b/EintooAR/Assets/AssetArt/AR/UI/Home/首页-海报@3x.png new file mode 100644 index 00000000..3783e7af Binary files /dev/null and b/EintooAR/Assets/AssetArt/AR/UI/Home/首页-海报@3x.png differ diff --git a/EintooAR/Assets/AssetArt/AR/UI/Home/首页-海报@3x.png.meta b/EintooAR/Assets/AssetArt/AR/UI/Home/首页-海报@3x.png.meta new file mode 100644 index 00000000..d8124d31 --- /dev/null +++ b/EintooAR/Assets/AssetArt/AR/UI/Home/首页-海报@3x.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: e436547d76bb9344193b98522dcaf4bc +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: 4 + 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: 4 + buildTarget: Win64 + 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: 4 + buildTarget: WebGL + 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: 4 + buildTarget: iOS + 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: 4 + 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: 4 + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv b/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv index 2b9cc81f..15dd6a99 100644 --- a/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv +++ b/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv @@ -1,31 +1,45 @@ -Keys,中文简体 [zh],English [en],中文繁体 [zh-HK] +Keys,中文简体 [zh],English,中文繁体 [zh-HK] +ar_ARFindPet,AR寻宠,ARFindPet,AR尋寵 +ar_ARSelectType,请选择品种,Please select a variety,請選擇品種 +ar_ARSelectZone,请选择地区,Please select a region,請選擇地區 +ar_ArClickCollect,点击收藏,ClickCollect,點擊收藏 +ar_ArCollect,收藏,Collect,收藏 +ar_ArCompany,AR企业,AR Company,AR企業 ar_ArExample,AR案例,AR Example,AR案例 +ar_ArSearch,搜索,Search,搜尋 ar_ArTeacher,"虚拟人: 涂涂 岗位: 产品功能讲解员","Virtual Human: tutu Position: Product explainer","虛擬人: 塗塗 職位: 產品功能解說員" ar_ArVirturalHuman,AR虚拟人,AR Virtual Human,AR虛擬人 +ar_Arself,我的,Self,我的 +ar_Cancel,取消,Cancel,取消 +ar_Cancle,取消,, +ar_Confirm,确认,Sure,確認 +ar_DeletePetInfo,是否删除该AR宠物信息？,Do you want to delete the AR pet information?,是否刪除該AR寵物信息？ +ar_FindARBrochure,找不到宣传册？前往搜索,Can't find the brochure? Go to search.,找不到宣傳冊？前往搜尋 ar_HelloWorld,"你好,AR世界","Hi,ARWorld","你好,AR世界" ar_Main,首页,Main,首頁 -ar_Retrun,返回,Return,返回 -ar_StartTest,开始体验,Start,開始體驗 -ar_ArCollect,收藏,Collect,收藏 -ar_ArClickCollect,点击收藏,ClickCollect,點擊收藏 -ar_ArCompany,AR企业,AR Company,AR企業 +ar_PetInfo,宠物信息,Pet Infomation,寵物信息 +ar_PetInformationbank,宠物信息库,PetInformationbank,寵物信息庫 +ar_PetOwnInfo,宠物主人信息,Pet owner information,寵物主人信息 ar_PlaceModel,模型放置,PlaceModel,模型放置 -ar_ResetModel,重置,Reset,重置 -ar_FindARBrochure,找不到宣传册？前往搜索,Can't find the brochure? Go to search.,找不到宣傳冊？前往搜尋 -ar_Arself,我的,Self,我的 -ar_ArSearch,搜索,Search,搜尋 -ar_historySearch,历史搜索,Historical search,歷史搜尋 ar_PleaseInputCompanyName,请输入公司名称货AR项目名称,Please enter the company name and the AR project name,請輸入公司名稱貨AR項目名稱 -ar_Cancel,取消,Cancel,取消 -ar_Confirm,确定,Confirm,確定 +ar_ResetModel,重置,Reset,重置 +ar_Retrun,返回,Return,返回 +ar_StartTest,开始,Start,開始體驗 +ar_Sure,确认,Sure,確認 +ar_Tips,提示,Tip,提示 +ar_TrackImages,识别图相册,Identification photo album, +ar_addtionPet,新增宠物,AddtionPet,新增寵物 +ar_games,AR游戏,AR Games,AR遊戲 +ar_historySearch,历史搜索,Historical search,歷史搜尋 +ar_imageRecognition,AR识图,AR image recognition,AR識圖 +ar_imageTrackTip,滑动模块启动AR新体验,Slide module to start new AR experience,滑動模組啟動AR新體驗 +ar_intoo,英领之涂,intoo,英領之塗 ar_languageSwitch,语言切换,Language Switch,語言切換 ar_virtualHall,虚拟展厅,Virtual Hall,虛擬展廳 ar_virtualPeople,虚拟人,Virtual Person,虛擬人 -ar_games,AR游戏,AR Games,AR遊戲 -ar_intoo,英领之涂,intoo,英領之塗 -ar_imageRecognition,AR识图,AR image recognition,AR識圖 -ar_imageTrackTip,滑动模块启动AR新体验,Slide module to start new AR experience,滑動模組啟動AR新體驗 -ar_xuanchuance,AR宣传册,AR Brochure,AR宣傳冊 \ No newline at end of file +ar_xuanchuance,AR宣传册,AR Brochure,AR宣傳冊 +ar_lookingforpets,AR寻宠,AR looking for pets, +ar_Treasure Hunt,AR寻宝,ar_Treasure Hunt, \ No newline at end of file diff --git a/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv.meta b/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv.meta index 48c5df52..7f10fbea 100644 --- a/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv.meta +++ b/EintooAR/Assets/AssetRaw/Configs/Languages/I2Loc EintooAR Localization - Default.csv.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee02bf7b2d673fa4c954e6e46d74e9fa +guid: 7fdcb21755d59fb4092bb06a71dcfe03 TextScriptImporter: externalObjects: {} userData: diff --git a/EintooAR/Assets/AssetRaw/UI/AR/UIARBrochureHome.prefab b/EintooAR/Assets/AssetRaw/UI/AR/UIARBrochureHome.prefab index 5cec8656..dc157c29 100644 --- a/EintooAR/Assets/AssetRaw/UI/AR/UIARBrochureHome.prefab +++ b/EintooAR/Assets/AssetRaw/UI/AR/UIARBrochureHome.prefab @@ -37,7 +37,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: -1324.4401} + m_AnchoredPosition: {x: 375, y: -1727.0677} m_SizeDelta: {x: 750, y: 414.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &10132045 @@ -426,7 +426,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: -1828.7451} + m_AnchoredPosition: {x: 375, y: -2231.3728} m_SizeDelta: {x: 750, y: 594.33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &298909684 @@ -773,7 +773,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.000061035156, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1279645184 @@ -2258,6 +2258,83 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4148602747694494602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6663405989046328212} + - component: {fileID: 8398632531645732018} + - component: {fileID: 3622915683011596025} + m_Layer: 5 + m_Name: m_ARTreasureHunt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6663405989046328212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4148602747694494602} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3098361244419140539} + - {fileID: 6290412149726926876} + m_Father: {fileID: 9007905762013467038} + 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: -1318.6139} + m_SizeDelta: {x: 750, y: 402.6277} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8398632531645732018 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4148602747694494602} + m_CullTransparentMesh: 1 +--- !u!114 &3622915683011596025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4148602747694494602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4518469395386726828 GameObject: m_ObjectHideFlags: 0 @@ -3329,7 +3406,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 511bf9173ecd6f64a9db653fa09cb8fd, type: 3} + m_Sprite: {fileID: 21300000, guid: 59fb04aa26a014948966c42f7811ca97, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3372,6 +3449,7 @@ RectTransform: - {fileID: 9007905763611768384} - {fileID: 9007905762516033987} - {fileID: 9007905762813011548} + - {fileID: 6663405989046328212} - {fileID: 10132043} - {fileID: 298909682} m_Father: {fileID: 9007905763046839687} @@ -3636,7 +3714,6 @@ RectTransform: m_Children: - {fileID: 9007905762778231762} - {fileID: 9007905762012894126} - - {fileID: 9007905762658732055} - {fileID: 9007905763423783127} m_Father: {fileID: 9007905762013467038} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3802,15 +3879,15 @@ RectTransform: m_GameObject: {fileID: 9007905762658732048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0003841, y: 1.0003841, z: 1.0003841} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9007905762516033987} + m_Father: {fileID: 9007905763423783127} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4612797, y: 0.42586863} - m_AnchorMax: {x: 1, y: 0.6937884} - m_AnchoredPosition: {x: -0.14199829, y: -1} - m_SizeDelta: {x: -0.212, y: -0.4822998} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -0.0000076293945, y: 89.73915} + m_SizeDelta: {x: 404.0922, y: 165.7466} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9007905762658732052 CanvasRenderer: @@ -3840,7 +3917,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u865A\u62DF\u4EBA: \u6D82\u6D82\n\u5C97\u4F4D: \u4EA7\u54C1\u529F\u80FD\u8BB2\u89E3\u5458" + m_text: "AR\u5BFB\u5BA0" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} @@ -3867,14 +3944,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 5.5 @@ -3923,7 +4000,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: ar_ArTeacher + mTerm: ar_lookingforpets mTermSecondary: PrimaryTermModifier: 0 SecondaryTermModifier: 0 @@ -4688,7 +4765,7 @@ MonoBehaviour: m_HandleRect: {fileID: 9007905762795770553} m_Direction: 2 m_Value: 1 - m_Size: 0.62749594 + m_Size: 0.52757764 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4725,6 +4802,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3237885877813729774} + - {fileID: 9007905762658732055} m_Father: {fileID: 9007905762516033987} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4612797, y: 0.1367979} @@ -5255,6 +5333,398 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &9080595063101837264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6290412149726926876} + - component: {fileID: 8291769460167425689} + - component: {fileID: 5154677820904320639} + m_Layer: 0 + m_Name: m_btnARTreasureHunt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6290412149726926876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9080595063101837264} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6663405989046328212} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 670.0547, y: 291.3285} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8291769460167425689 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9080595063101837264} + m_CullTransparentMesh: 1 +--- !u!114 &5154677820904320639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9080595063101837264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e436547d76bb9344193b98522dcaf4bc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 + m_DrawShape: 0 + m_ImageType: 0 + m_MaterialMode: 0 + m_StrokeWidth: 0 + m_OutlineWidth: 0 + m_OutlineColor: {r: 0, g: 0, b: 0, a: 1} + m_FalloffDistance: 0.5 + m_ConstrainRotation: 1 + m_ShapeRotation: 0 + m_FlipHorizontal: 0 + m_FlipVertical: 0 + m_Triangle: + m_CornerRadius: {x: 0, y: 0, z: 0} + m_UniformCornerRadius: 0 + m_Rectangle: + m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} + m_UniformCornerRadius: 0 + m_Circle: + m_Radius: 0 + m_FitRadius: 0 + m_Pentagon: + m_CornerRadius: {x: 0, y: 0, z: 0, w: 0} + m_UniformCornerRadius: 0 + m_TipRadius: 0.001 + m_TipSize: 1 + m_Hexagon: + m_CornerRadius: {x: 1, y: 1, z: 1, w: 1} + m_UniformCornerRadius: 0 + m_TipSize: {x: 1, y: 1} + m_UniformTipSize: 0 + m_TipRadius: {x: 1, y: 1} + m_UniformTipRadius: 0 + m_NStarPolygon: + m_SideCount: 3 + m_Inset: 2 + m_CornerRadius: 0 + m_Offset: {x: 0, y: 0} + m_GradientEffect: + m_Enabled: 0 + m_GradientType: 0 + m_Gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + m_CornerGradientColors: + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + - {r: 0, g: 0, b: 0, a: 0} + m_Rotation: 0 +--- !u!1001 &2728252082290379035 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6663405989046328212} + m_Modifications: + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_SizeDelta.x + value: 750 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_SizeDelta.y + value: 59.9 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchoredPosition.x + value: 375 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchoredPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258512687777, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_Name + value: SceneTitleGroup + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968817, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_text + value: "AR\u5BFB\u5B9D" + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968817, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} + - target: {fileID: 1090757258932968817, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} + - target: {fileID: 1090757258932968817, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968817, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968828, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_Name + value: m_Title + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_SizeDelta.x + value: 514.9508 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_SizeDelta.y + value: 59.9998 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchoredPosition.x + value: 303.90393 + objectReference: {fileID: 0} + - target: {fileID: 1090757258932968831, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_SizeDelta.x + value: 7.3605957 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_SizeDelta.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1090757260116232406, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1090757258932968828, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + insertIndex: -1 + addedObject: {fileID: 8858948455976872007} + m_SourcePrefab: {fileID: 100100000, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} +--- !u!224 &3098361244419140539 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + m_PrefabInstance: {fileID: 2728252082290379035} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3098361245036942439 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1090757258932968828, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} + m_PrefabInstance: {fileID: 2728252082290379035} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8858948455976872007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3098361245036942439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ar_Treasure Hunt + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI --- !u!1001 &4263610978027407944 PrefabInstance: m_ObjectHideFlags: 0 @@ -5333,7 +5803,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} propertyPath: m_AnchoredPosition.y - value: -29.949997 + value: -29.949951 objectReference: {fileID: 0} - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5353,7 +5823,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1090757258932968817, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} propertyPath: m_text - value: "AI\u6848\u4F8B" + value: "AR\u6848\u4F8B" objectReference: {fileID: 0} - target: {fileID: 1090757258932968817, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} propertyPath: m_fontAsset @@ -6056,7 +6526,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} propertyPath: m_AnchoredPosition.y - value: -29.949997 + value: -29.949951 objectReference: {fileID: 0} - target: {fileID: 1090757258512687776, guid: a90467fddb3794a40aa25fce3c5628cf, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/EintooAR/Assets/Editor/I2Localization/I2Languages.asset b/EintooAR/Assets/Editor/I2Localization/I2Languages.asset index 02e3cbc2..9679cf66 100644 --- a/EintooAR/Assets/Editor/I2Localization/I2Languages.asset +++ b/EintooAR/Assets/Editor/I2Localization/I2Languages.asset @@ -248,7 +248,7 @@ MonoBehaviour: TermType: 0 Description: Languages: - - "\u5F00\u59CB\u4F53\u9A8C" + - "\u5F00\u59CB" - Start - "\u958B\u59CB\u9AD4\u9A57" Flags: 000000 @@ -257,9 +257,9 @@ MonoBehaviour: TermType: 0 Description: Languages: - - "\u786E\u5B9A" + - "\u786E\u8BA4" - Sure - - "\u78BA\u5B9A" + - "\u78BA\u8A8D" Flags: 000000 Languages_Touch: [] - Term: ar_Tips @@ -370,41 +370,22 @@ MonoBehaviour: - "AR\u5BA3\u50B3\u518A" Flags: 000000 Languages_Touch: [] - - Term: ar_ARRecord + - Term: ar_lookingforpets TermType: 0 Description: Languages: - - "AR\u8BC6\u522B" - - ARrecognition - - "AR\u8B58\u5225" + - "AR\u5BFB\u5BA0" + - AR looking for pets + - Flags: 000000 Languages_Touch: [] - - Term: ar_ArGameTips + - Term: ar_Treasure Hunt TermType: 0 Description: Languages: - - "\u524D\u5F80\u4F01\u4E1A\u540E\u53F0\u914D\u7F6E\u4E0A\u67B6\u540E\u5373\u53EF\u70B9\u4EAE\u5BF9\u5E94\u6E38\u620F" - - G to the enterprise background configuration and put it on the shelof, and - you can light up the corresponding game - - "\u524D\u5F80\u4F01\u696D\u5F8C\u81FA\u914D\u7F6E\u4E0A\u67B6\u5F8C\u5373\u53EF\u9EDE\u4EAE\u5C0D\u61C9\u904A\u6232" - Flags: 000000 - Languages_Touch: [] - - Term: ar_ARGame - TermType: 0 - Description: - Languages: - - "AR\u6E38\u620F" - - ARGame - - "AR\u904A\u6232" - Flags: 000000 - Languages_Touch: [] - - Term: ar_Sure2 - TermType: 0 - Description: - Languages: - - "\u786E\u5B9A" - - Sure - - "\u78BA\u5B9A" + - "AR\u5BFB\u5B9D" + - ar_Treasure Hunt + - Flags: 000000 Languages_Touch: [] CaseInsensitiveTerms: 0 @@ -425,7 +406,7 @@ MonoBehaviour: Google_WebServiceURL: https://script.google.com/macros/s/AKfycbyMJIRUEwjOOACTcEVkNzBk2KmimWIpcU2xnwwkNDSGNFVRxWmvfjRxHzB20M3sopiDUA/exec Google_SpreadsheetKey: 1F3QGlpyEWpkQSP2n-CVC7wL2zr2llKWmT1KpI8dfyEA Google_SpreadsheetName: I2Loc TEngine Localization - Google_LastUpdatedVersion: 1742521166409 + Google_LastUpdatedVersion: 1744680630447 Google_Password: change_this GoogleUpdateFrequency: 3 GoogleInEditorCheckFrequency: 2 diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/BattleSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/BattleSystem.cs new file mode 100644 index 00000000..704e34c1 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/BattleSystem.cs @@ -0,0 +1,32 @@ +using Fantasy.Entitas; +using TEngine; + +namespace GameLogic +{ + public class BattleSystem : BaseLogicSys,IEventAttributeUpdate + { + public override bool OnInit() + { + GameEvent.AddEventListener(IEventAttributeUpdate_Event.AttributeUpdate, + AttributeUpdate); + return base.OnInit(); + } + + public override void OnStart() + { + base.OnStart(); + } + + public override void OnDestroy() + { + base.OnDestroy(); + GameEvent.RemoveEventListener(IEventAttributeUpdate_Event.AttributeUpdate, + AttributeUpdate); + } + + public void AttributeUpdate(AttributeType attributeType, float value) + { + Log.Info(attributeType.ToString() + " : " + value); + } + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/BattleSystem.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/BattleSystem.cs.meta new file mode 100644 index 00000000..0891b057 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/BattleSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2e41988cff5945bf996cafcb511ed38c +timeCreated: 1744698261 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom/Enum.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom/Enum.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat.meta new file mode 100644 index 00000000..0948a3cb --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 30e8f64e12874c63976fa0992492e464 +timeCreated: 1744689626 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat/NumericType.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat/NumericType.cs new file mode 100644 index 00000000..148b2c26 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat/NumericType.cs @@ -0,0 +1,22 @@ +namespace GameLogic +{ + public enum NumericType + { + /// + /// 基础值添加 + /// + BaseAdd, + /// + /// 基础百分比添加 + /// + BaseAddPct, + /// + /// 最终值添加 + /// + FinalAdd, + /// + /// 最终百分比添加 + /// + FinalPct + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat/NumericType.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat/NumericType.cs.meta new file mode 100644 index 00000000..1aa7bf06 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/Combat/NumericType.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e58deca923444384b44bc3dea63bab1a +timeCreated: 1744689635 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom/Enum/EAttributeType.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/EAttributeType.cs similarity index 72% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom/Enum/EAttributeType.cs rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/EAttributeType.cs index f6bbce27..0399b810 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom/Enum/EAttributeType.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/EAttributeType.cs @@ -2,11 +2,12 @@ using Sirenix.OdinInspector; namespace GameLogic { - public enum EAttributeType + public enum AttributeType { + + None, [LabelText("生命值")]Hp, [LabelText("魔法值")]Mp, - [LabelText("攻击力")]Attack, [LabelText("移动速度")]MoveSpeed, } } \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom/Enum/EAttributeType.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/EAttributeType.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Commom/Enum/EAttributeType.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Enum/EAttributeType.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event.meta new file mode 100644 index 00000000..a6e489ae --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 27625cf85a714acc9c48a0428d5569c7 +timeCreated: 1744696274 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event/IEventAttributeUpdate.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event/IEventAttributeUpdate.cs new file mode 100644 index 00000000..4875bd6b --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event/IEventAttributeUpdate.cs @@ -0,0 +1,12 @@ +using Fantasy.Entitas; +using TEngine; + +namespace GameLogic +{ + + [EventInterface(EEventGroup.GroupLogic)] + public interface IEventAttributeUpdate + { + void AttributeUpdate(AttributeType attributeType,float value); + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event/IEventAttributeUpdate.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event/IEventAttributeUpdate.cs.meta new file mode 100644 index 00000000..4301e4ee --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Commom/Event/IEventAttributeUpdate.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e970508288fb421197b5249dc3ebfe37 +timeCreated: 1744696279 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute.meta new file mode 100644 index 00000000..987fca17 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 56c4a0e9d7c04144b57e0835916e6693 +timeCreated: 1744696119 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/Attribute.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/Attribute.cs new file mode 100644 index 00000000..47e15588 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/Attribute.cs @@ -0,0 +1,9 @@ +using Fantasy.Entitas; + +namespace GameLogic +{ + public class GameAttribute : Entity + { + public AttributeType AttributeType; + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/Attribute.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/Attribute.cs.meta new file mode 100644 index 00000000..9effb7c8 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/Attribute.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f59051adf2f14430a39ec492e171d9ec +timeCreated: 1744696126 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/AttributeComponent.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/AttributeComponent.cs new file mode 100644 index 00000000..64048173 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/AttributeComponent.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using Fantasy.Entitas; +using GAS.Runtime; + +namespace GameLogic +{ + public class AttributeComponent : Entity + { + public readonly Dictionary Attributes = new Dictionary(); + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component/AttributeComponent.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/AttributeComponent.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component/AttributeComponent.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Attribute/AttributeComponent.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/CombatUnit.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/CombatUnit.cs new file mode 100644 index 00000000..9df1f3a4 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/CombatUnit.cs @@ -0,0 +1,11 @@ +using Fantasy.Entitas; +using GAS.Runtime; +using UnityEngine; + +namespace GameLogic +{ + public class CombatUnit : Entity + { + + } +} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/CombatEntity.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/CombatUnit.cs.meta similarity index 100% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/CombatEntity.cs.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/CombatUnit.cs.meta diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric.meta new file mode 100644 index 00000000..31883f64 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 67200439e91a4cebbef820589c225c59 +timeCreated: 1744688715 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericComponent.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericComponent.cs new file mode 100644 index 00000000..ce8b1268 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericComponent.cs @@ -0,0 +1,16 @@ +using System.Collections.Generic; +using Fantasy.Entitas; + +namespace GameLogic +{ + public class NumericComponent : Entity + { + public float Value; + public float BaseValue; + public float BaseAdd; + public float BaseAddPct; + public float FinalAdd; + public float FinalAddPct; + public readonly Dictionary ModifyCollections = new Dictionary(); + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericComponent.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericComponent.cs.meta new file mode 100644 index 00000000..599713d9 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ca63bb9196664804bb766677aae6a4c5 +timeCreated: 1744688875 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModify.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModify.cs new file mode 100644 index 00000000..f2ba1655 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModify.cs @@ -0,0 +1,10 @@ +using Fantasy.Entitas; + +namespace GameLogic +{ + public class NumericModify : Entity + { + public float Value; + } + +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModify.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModify.cs.meta new file mode 100644 index 00000000..17eb539a --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModify.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ffafb053a37346e6b8282b45c13cc455 +timeCreated: 1744688983 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModifyCollection.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModifyCollection.cs new file mode 100644 index 00000000..8add0590 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModifyCollection.cs @@ -0,0 +1,11 @@ +using System.Collections.Generic; +using Fantasy.Entitas; + +namespace GameLogic +{ + public class NumericModifyCollection : Entity + { + public float TotalValue = 0; + public readonly List Modifiers = new List(); + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModifyCollection.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModifyCollection.cs.meta new file mode 100644 index 00000000..0a9b5266 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/EntityMobel/Combat/Numeric/NumericModifyCollection.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 81190edc97fa4d01b00ed5012c8fa95e +timeCreated: 1744689104 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix.meta similarity index 77% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix.meta index d556da39..ada4ff91 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability.meta +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c31e74b39dbf604ea6964cd2ea97cc4 +guid: e9a676c8c28b8e34a86386a6fae2d6ee folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat.meta similarity index 77% rename from EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire.meta rename to EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat.meta index a8181c09..411802b6 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire.meta +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: acb10d4e7ff416f4981f2b8f1b0aefc8 +guid: e4aa22096f74feb4eb25608e1a54dd5f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute.meta new file mode 100644 index 00000000..89fff909 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d35ed0655a094c73be40e9f641335920 +timeCreated: 1744696112 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeComponentSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeComponentSystem.cs new file mode 100644 index 00000000..10196755 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeComponentSystem.cs @@ -0,0 +1,50 @@ +using System.Collections.Generic; +using Fantasy.Entitas.Interface; +using TEngine; + +namespace GameLogic +{ + + public class GameAttributeComponentAwakeSystem : AwakeSystem + { + protected override void Awake(AttributeComponent self) + { + self.AddAttribute(AttributeType.Hp,1000); + self.AddAttribute(AttributeType.Mp,1000); + self.AddAttribute(AttributeType.MoveSpeed,100); + } + } + + public class GameAttributeComponentDestroySystem : DestroySystem + { + protected override void Destroy(AttributeComponent self) + { + foreach (var attribute in self.Attributes.Values) + { + attribute.Dispose(); + } + self.Attributes.Clear(); + } + } + + public static class GameAttributeComponentSystem + { + public static void AddAttribute(this AttributeComponent self, AttributeType attributeType,float baseValue = 0) + { + if (self.Attributes.TryGetValue((int)attributeType,out var attribute)) + { + Log.Warning($"Attribute {attributeType} already exists.(属性已经存在)"); + return; + } + attribute = GameAttributeFactory.Create(attributeType); + attribute.SetBase(baseValue); + self.Attributes.Add((int)attributeType, attribute); + } + + public static GameAttribute GetAttribute(this AttributeComponent self, AttributeType attributeType) + { + return self.Attributes.GetValueOrDefault((int)attributeType); + } + + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeComponentSystem.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeComponentSystem.cs.meta new file mode 100644 index 00000000..6c1304fe --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeComponentSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 762295776d374735a314b4512e52f2b5 +timeCreated: 1744696826 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeFactory.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeFactory.cs new file mode 100644 index 00000000..52d63b60 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeFactory.cs @@ -0,0 +1,14 @@ +using Fantasy.Entitas; + +namespace GameLogic +{ + public static class GameAttributeFactory + { + public static GameAttribute Create(AttributeType attributeType) + { + var attribute = Entity.Create(GameManager.GameScene, true, true); + attribute.AttributeType = attributeType; + return attribute; + } + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeFactory.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeFactory.cs.meta new file mode 100644 index 00000000..833a3290 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeFactory.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: df3a99798d5e4584ac1b38b72b2ac9ee +timeCreated: 1744697416 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeSystem.cs new file mode 100644 index 00000000..74545efe --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeSystem.cs @@ -0,0 +1,67 @@ +using Fantasy.Entitas.Interface; +using TEngine; + +namespace GameLogic +{ + public class AttributeAwakeSystem : AwakeSystem + { + protected override void Awake(GameAttribute self) + { + self.AddComponent(); + } + } + + public class AttributeDestroySystem : DestroySystem + { + protected override void Destroy(GameAttribute self) + { + self.AttributeType = AttributeType.None; + } + } + + public static class GameAttributeSystem + { + public static void SetBase(this GameAttribute self,float baseValue) + { + self.GetComponent().SetBase(NumericType.BaseAdd,baseValue); + self.UpdateHandle(); + + } + + public static void AddBase(this GameAttribute self, float baseValue) + { + self.GetComponent().AddBase(NumericType.BaseAdd,baseValue); + self.UpdateHandle(); + } + + public static void MinusBase(this GameAttribute self, float baseValue) + { + self.GetComponent().MinusBase(NumericType.BaseAdd,baseValue); + self.UpdateHandle(); + } + + public static void AddModify(this GameAttribute self,NumericType numericType,NumericModify modify) + { + self.GetComponent().AddModify(numericType,modify); + self.UpdateHandle(); + } + public static void RemoveModify(this GameAttribute self,NumericType numericType,NumericModify modify) + { + self.GetComponent().RemoveModify(numericType,modify); + self.UpdateHandle(); + } + + + + private static void UpdateAttribute(this GameAttribute self,AttributeType attributeType, float value) + { + GameEvent.Get().AttributeUpdate(attributeType, value); + } + + private static void UpdateHandle(this GameAttribute self) + { + var numericComponent = self.GetComponent(); + self.UpdateAttribute(self.AttributeType, numericComponent.GetValue()); + } + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeSystem.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeSystem.cs.meta new file mode 100644 index 00000000..5d38cde0 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Attribute/GameAttributeSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5f717193353e45928f0089f0b4ba4675 +timeCreated: 1744696147 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/CombatSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/CombatSystem.cs new file mode 100644 index 00000000..ad4aad46 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/CombatSystem.cs @@ -0,0 +1,42 @@ +using Fantasy.Entitas.Interface; +using TEngine; +using UnityEngine; + +namespace GameLogic +{ + public class CombatUnitAwakeSystem : AwakeSystem + { + protected override void Awake(CombatUnit self) + { + self.AddComponent(); + } + } + + public class CombatUnitUpdateSystem : UpdateSystem + { + protected override void Update(CombatUnit self) + { + if (Input.GetKeyDown(KeyCode.S)) + { + var hp = self.GetComponent().GetAttribute(AttributeType.Hp); + + if (hp == null) + { + Log.Warning($"Attribute is not exist{hp.AttributeType}"); + return; + } + + var modify = NumericFactory.CreateModify(); + modify.Value = 20; + + hp.AddModify(NumericType.BaseAddPct, modify); + Log.Info("修改生命数值"); + } + } + } + + public static class CombatUnitSystem + { + + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/CombatSystem.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/CombatSystem.cs.meta new file mode 100644 index 00000000..b87cb229 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/CombatSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1bbafd8f30924b5e9f9847660559c65c +timeCreated: 1744698864 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric.meta new file mode 100644 index 00000000..e7585136 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b61b8b26dc492e141938c4cf5c98978b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericComponentSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericComponentSystem.cs new file mode 100644 index 00000000..6ff8138d --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericComponentSystem.cs @@ -0,0 +1,107 @@ +using Animancer; +using Fantasy.Entitas.Interface; + +namespace GameLogic +{ + + public class NumericComponentAwakeSystem : AwakeSystem + { + protected override void Awake(NumericComponent self) + { + self.Value = 0; + self.BaseValue = 0; + self.BaseAdd = 0; + self.BaseAddPct = 0; + self.FinalAdd = 0; + self.FinalAddPct = 0; + + self.ModifyCollections.Add((int)NumericType.BaseAdd, NumericFactory.CreateModifyCollection()); + self.ModifyCollections.Add((int)NumericType.BaseAddPct, NumericFactory.CreateModifyCollection()); + self.ModifyCollections.Add((int)NumericType.FinalAdd, NumericFactory.CreateModifyCollection()); + self.ModifyCollections.Add((int)NumericType.FinalPct, NumericFactory.CreateModifyCollection()); + } + } + + public class NumericComponentDestroySystem : DestroySystem + { + protected override void Destroy(NumericComponent self) + { + self.Value = 0; + self.BaseValue = 0; + self.BaseAdd = 0; + self.BaseAddPct = 0; + self.FinalAdd = 0; + self.FinalAddPct = 0; + + foreach (var collection in self.ModifyCollections.Values ) + { + collection.Dispose(); + } + self.ModifyCollections.Clear(); + } + } + public static class NumericComponentSystem + { + public static void SetBase(this NumericComponent self,NumericType numericType,float value) + { + self.BaseValue = value; + self.CalculateNumeric(); + } + + public static void AddBase(this NumericComponent self, NumericType numericType, float value) + { + self.BaseValue += value; + self.CalculateNumeric(); + } + + public static void MinusBase(this NumericComponent self, NumericType numericType, float value) + { + self.BaseValue -= value; + self.CalculateNumeric(); + } + + public static void AddModify(this NumericComponent self, NumericType numericType,NumericModify modify) + { + var value = self.ModifyCollections[(int)numericType].AddModify(modify); + SetNumericParameters(self, numericType, value); + } + + public static void RemoveModify(this NumericComponent self, NumericType numericType, NumericModify modify) + { + var value = self.ModifyCollections[(int)numericType].RemoveModify(modify); + if(numericType == NumericType.BaseAdd) self.BaseAdd = value; + if(numericType == NumericType.BaseAddPct) self.BaseAddPct = value; + if(numericType == NumericType.FinalAdd) self.FinalAdd = value; + if(numericType == NumericType.BaseAddPct) self.BaseAddPct = value; + self.CalculateNumeric(); + + } + + + private static void SetNumericParameters(NumericComponent self, NumericType numericType, float value) + { + if(numericType == NumericType.BaseAdd) self.BaseAdd = value; + if(numericType == NumericType.BaseAddPct) self.BaseAddPct = value; + if(numericType == NumericType.FinalAdd) self.FinalAdd = value; + if(numericType == NumericType.BaseAddPct) self.BaseAddPct = value; + self.CalculateNumeric(); + } + private static void CalculateNumeric(this NumericComponent self) + { + var baseValue =(self.BaseValue + self.BaseAdd) * (100 + self.BaseAddPct) / 100f; + var finalValue = (baseValue + self.FinalAdd) * (100 + self.FinalAddPct) / 100f; + self.Value = finalValue; + } + + + public static float GetValue(this NumericComponent self) + { + return self.Value; + } + } + + + + + +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericComponentSystem.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericComponentSystem.cs.meta new file mode 100644 index 00000000..6743ea72 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericComponentSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 68517455694e4d179c4e75295a1ff290 +timeCreated: 1744689616 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericFactory.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericFactory.cs new file mode 100644 index 00000000..74c733d5 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericFactory.cs @@ -0,0 +1,20 @@ +using Fantasy.Entitas; + +namespace GameLogic +{ + public static class NumericFactory + { + public static NumericModifyCollection CreateModifyCollection() + { + var collection = Entity.Create(GameManager.GameScene,false,false); + return collection; + } + + public static NumericModify CreateModify() + { + var modify = Entity.Create(GameManager.GameScene,true,true); + return modify; + } + + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericFactory.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericFactory.cs.meta new file mode 100644 index 00000000..f96b012c --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericFactory.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5a58c981254c4ea7b67355e475c25985 +timeCreated: 1744695167 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifyCollectionSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifyCollectionSystem.cs new file mode 100644 index 00000000..76a3cc5e --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifyCollectionSystem.cs @@ -0,0 +1,29 @@ +namespace GameLogic +{ + public static class NumericModifyCollectionSystem + { + + public static float AddModify(this NumericModifyCollection self,NumericModify numericModify) + { + self.Modifiers.Add(numericModify); + CalculateValue(self); + return self.TotalValue; + } + public static float RemoveModify(this NumericModifyCollection self, NumericModify numericModify) + { + self.Modifiers.Remove(numericModify); + CalculateValue(self); + return self.TotalValue; + } + private static void CalculateValue(this NumericModifyCollection self) + { + self.TotalValue = 0; + foreach (var modify in self.Modifiers) + { + self.TotalValue += modify.Value; + } + } + + + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifyCollectionSystem.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifyCollectionSystem.cs.meta new file mode 100644 index 00000000..bf618569 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifyCollectionSystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6605a7d28bc04814b5da01523ec935fd +timeCreated: 1744689192 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifySystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifySystem.cs new file mode 100644 index 00000000..071fcb03 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifySystem.cs @@ -0,0 +1,12 @@ +using Fantasy.Entitas.Interface; + +namespace GameLogic +{ + public class NumericModifyDestroySystem : DestroySystem + { + protected override void Destroy(NumericModify self) + { + self.Value = 0; + } + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifySystem.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifySystem.cs.meta new file mode 100644 index 00000000..a3ed4492 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/BattleSystem/Hotfix/Combat/Numeric/NumericModifySystem.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e81986e5ada54a62adf92c09ec1b2b53 +timeCreated: 1744701940 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/Fire.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/Fire.cs deleted file mode 100644 index 95a7846f..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/Fire.cs +++ /dev/null @@ -1,19 +0,0 @@ -using GAS.Runtime; -using UnityEngine; - -namespace GameLogic -{ - public class Fire : AbstractAbility - { - - public GameObject m_bulletPrefab => AbilityAsset.m_bulletPrefab; - public Fire(FireAsset abilityAsset) : base(abilityAsset) - { - } - - public override AbilitySpec CreateSpec(AbilitySystemComponent owner) - { - return new FireSpec(this, owner); // 对应下文Fire的AbilitySpec - } - } -} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/Fire.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/Fire.cs.meta deleted file mode 100644 index 251e07b2..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/Fire.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 217d9cb626844b44a82164647f7e5824 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireAsset.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireAsset.cs deleted file mode 100644 index d3acc68b..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireAsset.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using GAS.Runtime; -using UnityEngine; - -namespace GameLogic -{ - public class FireAsset : AbilityAsset - { - - public GameObject m_bulletPrefab; - public override Type AbilityType() => typeof(Fire); - - } -} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireAsset.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireAsset.cs.meta deleted file mode 100644 index d121ad8b..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireAsset.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 6824f0c9f4933ff4c8137122a38997dd \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireSpec.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireSpec.cs deleted file mode 100644 index a163e8b3..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireSpec.cs +++ /dev/null @@ -1,31 +0,0 @@ -using GAS.Runtime; -using UnityEngine; - -namespace GameLogic -{ - public class FireSpec : AbilitySpec - { - public FireSpec(Fire ability, AbilitySystemComponent owner) : base(ability, owner) - { - } - - public override void ActivateAbility(params object[] args) - { - - var bullet = Object.Instantiate(Data.m_bulletPrefab).GetComponent(); - var transform = Owner.transform; - //bullet.InitAttack(); - TryEndAbility(); - } - - public override void CancelAbility() - { - - } - - public override void EndAbility() - { - //throw new System.NotImplementedException(); - } - } -} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireSpec.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireSpec.cs.meta deleted file mode 100644 index 3642b22f..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/Ability/Fire/FireSpec.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 8ecd860ce3143ad43842b9ffa20084f9 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/AbilitySystemComponentExtension.gen.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/AbilitySystemComponentExtension.gen.cs deleted file mode 100644 index 99a386eb..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/AbilitySystemComponentExtension.gen.cs +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////// -//// This is a generated file. //// -//// Do not modify it. //// -/////////////////////////////////// - -using System; -using System.Linq; -using UnityEngine; - -namespace GAS.Runtime -{ - public static class AbilitySystemComponentExtension - { - public static Type[] PresetAttributeSetTypes(this AbilitySystemComponent asc) - { - if (asc.Preset == null) return null; - var attrSetTypes = new Type[asc.Preset.AttributeSets.Length]; - for (var i = 0; i < asc.Preset.AttributeSets.Length; i++) - attrSetTypes[i] = GAttrSetLib.AttrSetTypeDict[asc.Preset.AttributeSets[i]]; - return attrSetTypes; - } - - public static GameplayTag[] PresetBaseTags(this AbilitySystemComponent asc) - { - if (asc.Preset == null) return null; - return asc.Preset.BaseTags; - } - - public static void InitWithPreset(this AbilitySystemComponent asc, int level, AbilitySystemComponentPreset preset = null) - { - if (preset != null) asc.SetPreset(preset); - if (asc.Preset == null) return; - -#if UNITY_EDITOR - if (asc.Preset.BaseAbilities != null && asc.Preset.BaseAbilities.Any(x => x == null)) - { - Debug.LogWarning($"BaseAbilities contains null in preset: {asc.Preset.name}"); - } -#endif - - asc.Init(asc.PresetBaseTags(), asc.PresetAttributeSetTypes(), asc.Preset.BaseAbilities, level); - } - } -} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/AbilitySystemComponentExtension.gen.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/AbilitySystemComponentExtension.gen.cs.meta deleted file mode 100644 index 3fbd4492..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/AbilitySystemComponentExtension.gen.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 6992ebd7ea621634a80aca4770919b2e \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAbilityLib.gen.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAbilityLib.gen.cs deleted file mode 100644 index 2afa3965..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAbilityLib.gen.cs +++ /dev/null @@ -1,34 +0,0 @@ -/////////////////////////////////// -//// This is a generated file. //// -//// Do not modify it. //// -/////////////////////////////////// - -using System; -using System.Collections.Generic; - -namespace GAS.Runtime -{ - public static class GAbilityLib - { - public struct AbilityInfo - { - public string Name; - public string AssetPath; - public Type AbilityClassType; - } - - public static AbilityInfo Bomb = new AbilityInfo { Name = "Bomb", AssetPath = "Assets/AssetRaw/Configs/GAS/GameplayAbilityLib/Bomb.asset",AbilityClassType = typeof(GAS.Runtime.TimelineAbility) }; - - public static AbilityInfo Fire = new AbilityInfo { Name = "Fire", AssetPath = "Assets/AssetRaw/Configs/GAS/GameplayAbilityLib/Fire.asset",AbilityClassType = typeof(GameLogic.Fire) }; - - public static AbilityInfo Sweep = new AbilityInfo { Name = "Sweep", AssetPath = "Assets/AssetRaw/Configs/GAS/GameplayAbilityLib/Sweep.asset",AbilityClassType = typeof(GAS.Runtime.TimelineAbility) }; - - - public static Dictionary AbilityMap = new Dictionary - { - ["Bomb"] = Bomb, - ["Fire"] = Fire, - ["Sweep"] = Sweep, - }; - } -} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAbilityLib.gen.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAbilityLib.gen.cs.meta deleted file mode 100644 index a46e653a..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAbilityLib.gen.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: df6bef22cd394324688e0bf862d9f41f \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrLib.gen.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrLib.gen.cs deleted file mode 100644 index 3da225a8..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrLib.gen.cs +++ /dev/null @@ -1,41 +0,0 @@ -/////////////////////////////////// -//// This is a generated file. //// -//// Do not modify it. //// -/////////////////////////////////// - -using System.Collections.Generic; - -namespace GAS.Runtime -{ - public static class GAttrLib - { - /// - /// 生命值 - /// - public const string HP = "HP"; - - /// - /// 移动速度 - /// - public const string Speed = "Speed"; - - /// - /// 攻击力 - /// - public const string Attack = "Attack"; - - /// - /// 魔法值 - /// - public const string MP = "MP"; - - // For facilitating the creation of a Value Dropdown in the editor. - public static List AttributeNames = new List() - { - "HP", - "Speed", - "Attack", - "MP", - }; - } -} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrLib.gen.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrLib.gen.cs.meta deleted file mode 100644 index ed5b63fd..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrLib.gen.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 84494e6afc8339a48914aa0cced3aa46 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrSetLib.gen.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrSetLib.gen.cs deleted file mode 100644 index 7281262e..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrSetLib.gen.cs +++ /dev/null @@ -1,315 +0,0 @@ -/////////////////////////////////// -//// This is a generated file. //// -//// Do not modify it. //// -/////////////////////////////////// - -using System; -using System.Collections.Generic; - -namespace GAS.Runtime -{ - public class AS_Bullet : AttributeSet - { - #region Attack - - /// - /// 攻击力 - /// - public AttributeBase Attack { get; } = new ("AS_Bullet", "Attack", 0f, CalculateMode.Stacking, (SupportedOperation)31, 0, 150); - - public void InitAttack(float value) - { - Attack.SetBaseValue(value); - Attack.SetCurrentValue(value); - } - - public void SetCurrentAttack(float value) - { - Attack.SetCurrentValue(value); - } - - public void SetBaseAttack(float value) - { - Attack.SetBaseValue(value); - } - - public void SetMinAttack(float value) - { - Attack.SetMinValue(value); - } - - public void SetMaxAttack(float value) - { - Attack.SetMaxValue(value); - } - - public void SetMinMaxAttack(float min, float max) - { - Attack.SetMinMaxValue(min, max); - } - - #endregion Attack - - public override AttributeBase this[string key] - { - get - { - switch (key) - { - case "Attack": - return Attack; - } - - return null; - } - } - - public override string[] AttributeNames { get; } = - { - "Attack", - }; - - public override void SetOwner(AbilitySystemComponent owner) - { - _owner = owner; - Attack.SetOwner(owner); - } - - public static class Lookup - { - public const string Attack = "AS_Bullet.Attack"; - } - } - - public class AS_Fight : AttributeSet - { - #region Attack - - /// - /// 攻击力 - /// - public AttributeBase Attack { get; } = new ("AS_Fight", "Attack", 0f, CalculateMode.Stacking, (SupportedOperation)31, 0, 150); - - public void InitAttack(float value) - { - Attack.SetBaseValue(value); - Attack.SetCurrentValue(value); - } - - public void SetCurrentAttack(float value) - { - Attack.SetCurrentValue(value); - } - - public void SetBaseAttack(float value) - { - Attack.SetBaseValue(value); - } - - public void SetMinAttack(float value) - { - Attack.SetMinValue(value); - } - - public void SetMaxAttack(float value) - { - Attack.SetMaxValue(value); - } - - public void SetMinMaxAttack(float min, float max) - { - Attack.SetMinMaxValue(min, max); - } - - #endregion Attack - - #region HP - - /// - /// 生命值 - /// - public AttributeBase HP { get; } = new ("AS_Fight", "HP", 0f, CalculateMode.Stacking, (SupportedOperation)31, 0, 10000); - - public void InitHP(float value) - { - HP.SetBaseValue(value); - HP.SetCurrentValue(value); - } - - public void SetCurrentHP(float value) - { - HP.SetCurrentValue(value); - } - - public void SetBaseHP(float value) - { - HP.SetBaseValue(value); - } - - public void SetMinHP(float value) - { - HP.SetMinValue(value); - } - - public void SetMaxHP(float value) - { - HP.SetMaxValue(value); - } - - public void SetMinMaxHP(float min, float max) - { - HP.SetMinMaxValue(min, max); - } - - #endregion HP - - #region MP - - /// - /// 魔法值 - /// - public AttributeBase MP { get; } = new ("AS_Fight", "MP", 0f, CalculateMode.Stacking, (SupportedOperation)31, 0, 1000); - - public void InitMP(float value) - { - MP.SetBaseValue(value); - MP.SetCurrentValue(value); - } - - public void SetCurrentMP(float value) - { - MP.SetCurrentValue(value); - } - - public void SetBaseMP(float value) - { - MP.SetBaseValue(value); - } - - public void SetMinMP(float value) - { - MP.SetMinValue(value); - } - - public void SetMaxMP(float value) - { - MP.SetMaxValue(value); - } - - public void SetMinMaxMP(float min, float max) - { - MP.SetMinMaxValue(min, max); - } - - #endregion MP - - #region Speed - - /// - /// 移动速度 - /// - public AttributeBase Speed { get; } = new ("AS_Fight", "Speed", 0f, CalculateMode.Stacking, (SupportedOperation)31, 0, 3.402823E+38f); - - public void InitSpeed(float value) - { - Speed.SetBaseValue(value); - Speed.SetCurrentValue(value); - } - - public void SetCurrentSpeed(float value) - { - Speed.SetCurrentValue(value); - } - - public void SetBaseSpeed(float value) - { - Speed.SetBaseValue(value); - } - - public void SetMinSpeed(float value) - { - Speed.SetMinValue(value); - } - - public void SetMaxSpeed(float value) - { - Speed.SetMaxValue(value); - } - - public void SetMinMaxSpeed(float min, float max) - { - Speed.SetMinMaxValue(min, max); - } - - #endregion Speed - - public override AttributeBase this[string key] - { - get - { - switch (key) - { - case "HP": - return HP; - case "Speed": - return Speed; - case "Attack": - return Attack; - case "MP": - return MP; - } - - return null; - } - } - - public override string[] AttributeNames { get; } = - { - "HP", - "Speed", - "Attack", - "MP", - }; - - public override void SetOwner(AbilitySystemComponent owner) - { - _owner = owner; - HP.SetOwner(owner); - Speed.SetOwner(owner); - Attack.SetOwner(owner); - MP.SetOwner(owner); - } - - public static class Lookup - { - public const string HP = "AS_Fight.HP"; - public const string Speed = "AS_Fight.Speed"; - public const string Attack = "AS_Fight.Attack"; - public const string MP = "AS_Fight.MP"; - } - } - - public static class GAttrSetLib - { - public static readonly Dictionary AttrSetTypeDict = new Dictionary() - { - { "Fight", typeof(AS_Fight) }, - { "Bullet", typeof(AS_Bullet) }, - }; - - public static readonly Dictionary TypeToName = new Dictionary - { - { typeof(AS_Fight), nameof(AS_Fight) }, - { typeof(AS_Bullet), nameof(AS_Bullet) }, - }; - - public static List AttributeFullNames = new List() - { - "AS_Fight.HP", - "AS_Fight.Speed", - "AS_Fight.Attack", - "AS_Fight.MP", - "AS_Bullet.Attack", - }; - } -} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrSetLib.gen.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrSetLib.gen.cs.meta deleted file mode 100644 index 63794a18..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GAttrSetLib.gen.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: c28e24a4401272a4ba8ae2194b529340 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GTagLib.gen.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GTagLib.gen.cs deleted file mode 100644 index b9e43e87..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GTagLib.gen.cs +++ /dev/null @@ -1,49 +0,0 @@ -/////////////////////////////////// -//// This is a generated file. //// -//// Do not modify it. //// -/////////////////////////////////// - -using System.Collections.Generic; - -namespace GAS.Runtime -{ - public static class GTagLib - { - public static GameplayTag Ability { get; } = new GameplayTag("Ability"); - public static GameplayTag Ability_Die { get; } = new GameplayTag("Ability.Die"); - public static GameplayTag Ability_Fire { get; } = new GameplayTag("Ability.Fire"); - public static GameplayTag Ability_Jump { get; } = new GameplayTag("Ability.Jump"); - public static GameplayTag Ability_Move { get; } = new GameplayTag("Ability.Move"); - public static GameplayTag Ability_NormalAttack { get; } = new GameplayTag("Ability.NormalAttack"); - public static GameplayTag CD { get; } = new GameplayTag("CD"); - public static GameplayTag CD_Sweep { get; } = new GameplayTag("CD.Sweep"); - public static GameplayTag Event { get; } = new GameplayTag("Event"); - public static GameplayTag Event_Moving { get; } = new GameplayTag("Event.Moving"); - public static GameplayTag Faction { get; } = new GameplayTag("Faction"); - public static GameplayTag Faction_Emeny { get; } = new GameplayTag("Faction.Emeny"); - public static GameplayTag Faction_Player { get; } = new GameplayTag("Faction.Player"); - public static GameplayTag State { get; } = new GameplayTag("State"); - public static GameplayTag State_Debuff { get; } = new GameplayTag("State.Debuff"); - public static GameplayTag State_Debuff_Cold { get; } = new GameplayTag("State.Debuff.Cold"); - - public static Dictionary TagMap = new Dictionary - { - ["Ability"] = Ability, - ["Ability.Die"] = Ability_Die, - ["Ability.Fire"] = Ability_Fire, - ["Ability.Jump"] = Ability_Jump, - ["Ability.Move"] = Ability_Move, - ["Ability.NormalAttack"] = Ability_NormalAttack, - ["CD"] = CD, - ["CD.Sweep"] = CD_Sweep, - ["Event"] = Event, - ["Event.Moving"] = Event_Moving, - ["Faction"] = Faction, - ["Faction.Emeny"] = Faction_Emeny, - ["Faction.Player"] = Faction_Player, - ["State"] = State, - ["State.Debuff"] = State_Debuff, - ["State.Debuff.Cold"] = State_Debuff_Cold, - }; - } -} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GTagLib.gen.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GTagLib.gen.cs.meta deleted file mode 100644 index 72e40377..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameAbilitySystem/GTagLib.gen.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 9c0673795bc107440961382b92f70529 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameManager.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameManager.cs index 9c2abf63..efc5c721 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameManager.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GameManager.cs @@ -14,7 +14,7 @@ namespace GameLogic public class GameManager : SingletonBehaviour { - public static Scene GameScene { get; set; } + public static Scene GameScene => GameNetSystem.Instance.m_gameScene; private List _logicSystems = new List(); private IFsm _modeFsm; @@ -56,6 +56,7 @@ namespace GameLogic _logicSystems.Add(WeatherSystem.Instance); _logicSystems.Add(CameraSystem.Instance); _logicSystems.Add(GameNetSystem.Instance); + _logicSystems.Add(BattleSystem.Instance); for (int i = 0; i < _logicSystems.Count; i++) { @@ -71,7 +72,14 @@ namespace GameLogic _modeFsm = GameModule.Fsm.CreateFsm("ModeFsm", this,_states); _modeFsm.Start(); } - + + private void Start() + { + foreach (var system in _logicSystems.ToArray()) + { + system.OnStart(); + } + } public void Update() { diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/ICombatComponent.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/ICombatComponent.cs deleted file mode 100644 index a78bbe77..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/ICombatComponent.cs +++ /dev/null @@ -1,14 +0,0 @@ -using GAS.Runtime; - -namespace GameLogic -{ - public interface ICombatComponent - { - AbilitySystemComponent ASC { get;} - void Init(); - void OnEnable(); - void OnUpdate(); - void OnDisable(); - void OnDestroy(); - } -} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/ICombatComponent.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/ICombatComponent.cs.meta deleted file mode 100644 index c03aeb4a..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/ICombatComponent.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 42076b4c306f433aa7a2eaa20d8edeea -timeCreated: 1743497803 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/CombatEntity.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/CombatEntity.cs deleted file mode 100644 index 3690cd67..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/CombatEntity.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Fantasy.Entitas; -using GAS.Runtime; -using UnityEngine; - -namespace GameLogic -{ - public class CombatEntity : Entity - { - private AbilitySystemComponent m_abilitySystem; - public AbilitySystemComponent ASC => m_abilitySystem; - #region 生命周期 - /// - /// 初始化 - /// - public void Init(AbilitySystemComponent asc) - { - m_abilitySystem = asc; - AddComponent(); - - } - - private void OnUpdate() - { - - } - - private void OnDestroy() - { - - } - #endregion - - - - - } -} diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component.meta deleted file mode 100644 index f85a789e..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ebcad2909c4f452ba2b8940ebde8eaab -timeCreated: 1743497187 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component/AttributeComponent.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component/AttributeComponent.cs deleted file mode 100644 index 6bc1f3aa..00000000 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/ECS/Mobel/Combat/Component/AttributeComponent.cs +++ /dev/null @@ -1,118 +0,0 @@ -using Fantasy.Entitas; -using GAS.Runtime; - -namespace GameLogic -{ - public class AttributeComponent : Entity,ICombatComponent - { - public AbilitySystemComponent ASC => (Parent as CombatEntity)?.ASC; - #region 生命周期 - public void Init() - { - var roleUnit = DataSystem.Instance.GetData().GetRoleUnit((int)Parent.Id); - if(roleUnit == null) return; - ASC.AttrSet().InitHP(roleUnit.Hp); - ASC.AttrSet().InitMP(roleUnit.Mp); - ASC.AttrSet().InitAttack(roleUnit.Attck); - ASC.AttrSet().InitSpeed(roleUnit.MoveSpeed); - } - - public void OnEnable() - { - - } - - public void OnUpdate() - { - - } - - public void OnDisable() - { - - } - - public void OnDestroy() - { - - } - - #endregion - - public void SetBaseValue(EAttributeType attribute,float value) - { - switch (attribute) - { - case EAttributeType.Hp: - ASC.AttrSet().SetBaseHP(value); - break; - case EAttributeType.Mp: - ASC.AttrSet().SetBaseMP(value); - break; - case EAttributeType.Attack: - ASC.AttrSet().SetBaseAttack(value); - break; - case EAttributeType.MoveSpeed: - ASC.AttrSet().SetBaseSpeed(value); - break; - } - } - - public void SetCurrentValue(EAttributeType attribute,float value) - { - switch (attribute) - { - case EAttributeType.Hp: - ASC.AttrSet().SetCurrentHP(value); - break; - case EAttributeType.Mp: - ASC.AttrSet().SetCurrentMP(value); - break; - case EAttributeType.Attack: - ASC.AttrSet().SetCurrentAttack(value); - break; - case EAttributeType.MoveSpeed: - ASC.AttrSet().SetCurrentSpeed(value); - break; - } - } - - public void SetMaxValue(EAttributeType attribute,float value) - { - switch (attribute) - { - case EAttributeType.Hp: - ASC.AttrSet().SetMaxHP(value); - break; - case EAttributeType.Mp: - ASC.AttrSet().SetMaxMP(value); - break; - case EAttributeType.Attack: - ASC.AttrSet().SetMaxAttack(value); - break; - case EAttributeType.MoveSpeed: - ASC.AttrSet().SetMaxSpeed(value); - break; - } - } - - public void SetMinValue(EAttributeType attribute,float value) - { - switch (attribute) - { - case EAttributeType.Hp: - ASC.AttrSet().SetMinHP(value); - break; - case EAttributeType.Mp: - ASC.AttrSet().SetMinMP(value); - break; - case EAttributeType.Attack: - ASC.AttrSet().SetMinAttack(value); - break; - case EAttributeType.MoveSpeed: - ASC.AttrSet().SetMinSpeed(value); - break; - } - } - } -} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs index 5835bc64..4003cff2 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/RPG/GamePlay/System/GameNet/GameNetSystem.cs @@ -36,14 +36,15 @@ namespace GameLogic // 创建一个Scene，这个Scene代表一个客户端的场景，客户端的所有逻辑都可以写这里 // 如果有自己的框架，也可以就单纯拿这个Scene做网络通讯也没问题。 m_gameScene = await Scene.Create(SceneRuntimeType.MainThread); - GameManager.GameScene = m_gameScene; if (m_gameScene == null) { Log.Info("连接服务器失败"); return; } - + InitCommand(); + + CombatUnit combat = Entity.Create(GameManager.GameScene,true,true); } diff --git a/EintooAR/Assets/Plugins/Rewired.meta b/EintooAR/Assets/Plugins/Rewired.meta new file mode 100644 index 00000000..110552ed --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 67b5b2972e42249f6b0218ab166e0a66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal.meta b/EintooAR/Assets/Plugins/Rewired/Internal.meta new file mode 100644 index 00000000..59cac96d --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8cdcfdd141b51d5458f981aaf449fd9f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries.meta new file mode 100644 index 00000000..207aa90f --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5192e1d4e2a5e3c458d84533f8fa1570 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime.meta new file mode 100644 index 00000000..41e3397f --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf9d2fdb3a18bed4383860d25872c0ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native.meta new file mode 100644 index 00000000..d2960aaf --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7429ae87efe08c8498d41370fef01fa2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone.meta new file mode 100644 index 00000000..62908f20 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c26870ff805786e429c8ab8592364540 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/ARM64.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/ARM64.meta new file mode 100644 index 00000000..73cf8013 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/ARM64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c7ccdbf75c375bf42a12b1af425a162b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x64.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x64.meta new file mode 100644 index 00000000..9f0863f0 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x64.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50203b4f2530a244082350f32f55bcd8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x86.meta b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x86.meta new file mode 100644 index 00000000..131e94d1 --- /dev/null +++ b/EintooAR/Assets/Plugins/Rewired/Internal/Libraries/Runtime/Native/WindowsStandalone/x86.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c056233622915f3429c723fed86f3439 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Packages/manifest.json b/EintooAR/Packages/manifest.json index d83d4dc2..51deab93 100644 --- a/EintooAR/Packages/manifest.json +++ b/EintooAR/Packages/manifest.json @@ -2,7 +2,7 @@ "dependencies": { "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git", "com.coffee.ui-effect": "5.6.1", - "com.fantasy.unity": "2024.2.24", + "com.fantasy.unity": "2024.2.25", "com.tuyoogame.yooasset": "2.1.2", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", diff --git a/EintooAR/Packages/packages-lock.json b/EintooAR/Packages/packages-lock.json index c4a73d63..cf9bf8ff 100644 --- a/EintooAR/Packages/packages-lock.json +++ b/EintooAR/Packages/packages-lock.json @@ -29,7 +29,7 @@ "dependencies": {} }, "com.fantasy.unity": { - "version": "2024.2.24", + "version": "2024.2.25", "depth": 0, "source": "registry", "dependencies": { diff --git a/EintooAR/ProjectSettings/AttributeAsset.asset b/EintooAR/ProjectSettings/AttributeAsset.asset index 49fc0160..87671133 100644 --- a/EintooAR/ProjectSettings/AttributeAsset.asset +++ b/EintooAR/ProjectSettings/AttributeAsset.asset @@ -30,7 +30,7 @@ MonoBehaviour: LimitMinValue: 1 MinValue: 0 LimitMaxValue: 1 - MaxValue: 3.4028235e+38 + MaxValue: 300 - Name: Attack Comment: "\u653B\u51FB\u529B" CalculateMode: 0 diff --git a/EintooAR/UserSettings/EditorUserSettings.asset b/EintooAR/UserSettings/EditorUserSettings.asset index e8c61068..bac4263b 100644 --- a/EintooAR/UserSettings/EditorUserSettings.asset +++ b/EintooAR/UserSettings/EditorUserSettings.asset @@ -6,32 +6,32 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 075200535d530a5e0e5f5e7140725944134f4f7d79717465782d1b30b0e6363e - flags: 0 - RecentlyUsedSceneGuid-1: value: 065706515d020b5e0e5b5b2647715b444e4f4a737b2c7f32292d4c65b4b2603b flags: 0 - RecentlyUsedSceneGuid-2: + RecentlyUsedSceneGuid-1: value: 550702020750080c0b0b0e7a48750b44154f1a722d2d7e65752a1c61b5b8353d flags: 0 - RecentlyUsedSceneGuid-3: + RecentlyUsedSceneGuid-2: value: 0606035f5c515b0d0e0a5a7213265d44414e1d2c2f782734782b4432b3e66d3b flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-3: value: 5005045453055d0f5f5e5f71472506441216497b7d2e7034292f4c35e0b7656e flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-4: value: 555255075c020c0f5c0c097013275e4417154c2b747177632b2a4562b3b3306a flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-5: value: 570850035c535b0a5c080e2446765944144f407f7f2d20652b2b1837e4b73139 flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-6: value: 5008015250005c5d0858542612265d44434e407a2f7b25667c7f4b65b6b4666e flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-7: value: 07045553540d0c025c590a2113250c44434e1b292d7971627e284b6be1b9616b flags: 0 + RecentlyUsedSceneGuid-8: + value: 0657045357065b0f0e585f77417b5c44174e1c7d7b2c2034797d4b30b0b06d3d + flags: 0 RecentlyUsedSceneGuid-9: value: 02500105010d500359565b7616225a44474e4c7d7b2c27337b7f4d31b1b8666f flags: 0 diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 39eab7f6..c23faecb 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 15 + controlID: 243 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 16 + controlID: 76 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -168,11 +168,11 @@ MonoBehaviour: x: 0 y: 0 width: 1405 - height: 417 + height: 554 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 17 + controlID: 47 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,7 +192,7 @@ MonoBehaviour: x: 0 y: 0 width: 433 - height: 417 + height: 554 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 16} @@ -218,9 +218,9 @@ MonoBehaviour: x: 433 y: 0 width: 288 - height: 417 - m_MinSize: {x: 202, y: 226} - m_MaxSize: {x: 4002, y: 4026} + height: 554 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -244,7 +244,7 @@ MonoBehaviour: x: 721 y: 0 width: 684 - height: 417 + height: 554 m_MinSize: {x: 52, y: 76} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 22} @@ -271,13 +271,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 417 + y: 554 width: 1405 - height: 516 + height: 379 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 187 + controlID: 77 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -297,9 +297,9 @@ MonoBehaviour: x: 0 y: 0 width: 131 - height: 516 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} + height: 379 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -323,7 +323,7 @@ MonoBehaviour: x: 131 y: 0 width: 791 - height: 516 + height: 379 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} m_ActualView: {fileID: 19} @@ -349,7 +349,7 @@ MonoBehaviour: x: 922 y: 0 width: 483 - height: 516 + height: 379 m_MinSize: {x: 232, y: 276} m_MaxSize: {x: 10002, y: 10026} m_ActualView: {fileID: 20} @@ -405,9 +405,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 24 + y: 79 width: 432 - height: 391 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -422,9 +422,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 20280100 m_LastClickedID: 0 - m_ExpandedIDs: 88faffff4e1d01008a1d0100 + m_ExpandedIDs: e6f5ffff6ef9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -470,10 +470,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 434 - y: 24 + x: 433 + y: 79 width: 286 - height: 391 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1022,15 +1022,15 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 0, y: 0.18964171, z: 0.00000023841858} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 0, y: 0.18964171, z: 0.00000023841858} + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1058,17 +1058,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -1076,17 +1076,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.04206977, y: -0.95709133, z: 0.20865029, w: 0.19665778} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.04206971, y: 0.95708996, z: -0.20865, w: -0.1966575} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 3.6547272 + m_Target: 10 speed: 2 - m_Value: 3.6547272 + m_Value: 10 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -1100,7 +1100,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.04206977, y: -0.95709133, z: 0.20865029, w: 0.19665778} m_LastSceneViewOrtho: 0 m_Viewpoint: m_SceneView: {fileID: 17} @@ -1135,9 +1135,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 24 + y: 633 width: 130 - height: 490 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1170,10 +1170,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 132 - y: 24 + x: 131 + y: 633 width: 789 - height: 490 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1196,7 +1196,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System + - Assets/Scenes m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1206,16 +1206,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: D:\UnityProject\EintooAR\EintooAR m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: 6e1e0100 - m_LastClickedID: 73326 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: ba240100 + m_LastClickedID: 74938 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001e240100202401002224010024240100262401002824010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1244,7 +1244,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c6230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001c2401001e2401002024010022240100242401002624010028240100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1323,10 +1323,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 923 - y: 24 + x: 922 + y: 633 width: 481 - height: 490 + height: 353 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1366,9 +1366,9 @@ MonoBehaviour: m_IsLocked: 1 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: fa1f0100 - m_LastClickedID: 73722 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + m_SelectedIDs: 7c250100 + m_LastClickedID: 75132 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c6230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001c2401001e24010020240100222401002424010026240100282401009224010000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1397,7 +1397,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000482a01009e460100a0460100a2460100a4460100a6460100a8460100aa460100ac460100ae460100b0460100b2460100b4460100b6460100b8460100ba460100bc460100be460100c0460100c2460100c4460100c6460100c8460100ca460100cc460100ce460100d0460100d2460100d4460100d6460100d8460100da460100dc460100de460100e0460100e2460100e4460100e6460100e8460100ea460100ec460100ee460100f0460100f2460100f4460100f6460100f8460100fa460100fc460100fe46010000470100024701000447010006470100084701000a470100 + m_ExpandedIDs: 000000008a170100bc230100be230100c0230100c2230100c4230100c6230100c8230100ca230100cc230100ce230100d0230100d2230100d4230100d6230100d8230100da230100dc230100de230100e0230100e2230100e4230100e6230100e8230100ea230100ec230100ee230100f0230100f2230100f4230100f6230100f8230100fa230100fc230100fe23010000240100022401000424010006240100082401000a2401000c2401000e24010010240100122401001424010016240100182401001a2401001c2401001e2401002024010022240100242401002624010028240100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1476,8 +1476,8 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1406 - y: 24 + x: 1405 + y: 79 width: 514 height: 907 m_SerializedDataModeController: @@ -1525,10 +1525,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 722 - y: 24 + x: 721 + y: 79 width: 682 - height: 391 + height: 528 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1573,7 +1573,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 1 + m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -1585,22 +1585,22 @@ MonoBehaviour: x: 0 y: 21 width: 682 - height: 370 - m_Scale: {x: 0.27736133, y: 0.27736133} - m_Translation: {x: 341.00003, y: 184.99997} + height: 507 + m_Scale: {x: 0.38005996, y: 0.38005996} + m_Translation: {x: 341, y: 253.49998} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1229.4432 - y: -666.9999 - width: 2458.8865 - height: 1333.9999 + x: -897.22687 + y: -667 + width: 1794.4537 + height: 1334 m_MinimalGUI: 1 - m_defaultScale: 0.27736133 - m_LastWindowPixelSize: {x: 682, y: 391} + m_defaultScale: 0.38005996 + m_LastWindowPixelSize: {x: 682, y: 528} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000101000000000000 diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs index 266c8a5d..07f69a7a 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("APlugins")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("APlugins")] [assembly: System.Reflection.AssemblyTitleAttribute("APlugins")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache index eaa2d496..a8af15b5 100644 --- a/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache +++ b/GameServer/Server/APlugins/obj/Debug/net9.0/APlugins.AssemblyInfoInputs.cache @@ -1 +1 @@ -ed381ebd5c32a32faf832484949ce803d6f194c5489cedafbac81b8d6b9e5a85 +43e0e398ae5e32ca33bc9471ee513ad5e696e66cc472ec5ec0a9f87ef8721ace diff --git a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info index 588b4605..97da5c2b 100644 --- a/GameServer/Server/APlugins/obj/rider.project.model.nuget.info +++ b/GameServer/Server/APlugins/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17445925597721448 \ No newline at end of file diff --git a/GameServer/Server/APlugins/obj/rider.project.restore.info b/GameServer/Server/APlugins/obj/rider.project.restore.info index 588b4605..9b22325a 100644 --- a/GameServer/Server/APlugins/obj/rider.project.restore.info +++ b/GameServer/Server/APlugins/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17446243488696810 \ No newline at end of file diff --git a/GameServer/Server/Entity/Model/Chat/ChatManagementComponent.cs b/GameServer/Server/Entity/Model/Chat/ChatManagementComponent.cs new file mode 100644 index 00000000..7be35bd5 --- /dev/null +++ b/GameServer/Server/Entity/Model/Chat/ChatManagementComponent.cs @@ -0,0 +1,8 @@ + + +using Fantasy.Entitas; + +public class ChatManagementComponent : Entity +{ + +} \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs index 7f548447..3e59bce2 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Entity")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("Entity")] [assembly: System.Reflection.AssemblyTitleAttribute("Entity")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache index 8f97b826..1290b619 100644 --- a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache +++ b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.AssemblyInfoInputs.cache @@ -1 +1 @@ -cd771dd1f1c553ef3c85e59048e5aad5c2a553d29f985d3eaa9e64dd9baf70c5 +13f3104b25ee7b72457ad6eda84a41b94fdf1d507da74741102c9e9ab8783363 diff --git a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache index 48debd18..c9638d68 100644 Binary files a/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache and b/GameServer/Server/Entity/obj/Debug/net9.0/Entity.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Entity/obj/rider.project.model.nuget.info b/GameServer/Server/Entity/obj/rider.project.model.nuget.info index 588b4605..59deb38f 100644 --- a/GameServer/Server/Entity/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Entity/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17445925597890487 \ No newline at end of file diff --git a/GameServer/Server/Entity/obj/rider.project.restore.info b/GameServer/Server/Entity/obj/rider.project.restore.info index 588b4605..39f97ac1 100644 --- a/GameServer/Server/Entity/obj/rider.project.restore.info +++ b/GameServer/Server/Entity/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17446243488702004 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs b/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs index a8cd923a..b381a4cd 100644 --- a/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs +++ b/GameServer/Server/Hotfix/OnCreateScene_InitEvent.cs @@ -20,6 +20,10 @@ public class OnCreateScene_InitEvent : AsyncEventSystem scene.AddComponent(); Log.Debug("初始网关（Gate）服务器组件"); break; + + case SceneType.Chat: + scene.AddComponent(); + break; } await FTask.CompletedTask; diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs index 3b7700f2..1432748b 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Hotfix")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("Hotfix")] [assembly: System.Reflection.AssemblyTitleAttribute("Hotfix")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache index 4cfa4a8b..2e6832f0 100644 --- a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache +++ b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.AssemblyInfoInputs.cache @@ -1 +1 @@ -a36d5d41d8f4e08e36f3e6309ff8b6b3fb7e510781b5c5c020488d8c803f82cc +2e090cacf21634ed778c4b58a890448889cdadc59f62e57779400d185d6066b3 diff --git a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache index e242566f..fdeed505 100644 Binary files a/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache and b/GameServer/Server/Hotfix/obj/Debug/net9.0/Hotfix.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info index 588b4605..74458a75 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Hotfix/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17445925598071222 \ No newline at end of file diff --git a/GameServer/Server/Hotfix/obj/rider.project.restore.info b/GameServer/Server/Hotfix/obj/rider.project.restore.info index 588b4605..18de19b0 100644 --- a/GameServer/Server/Hotfix/obj/rider.project.restore.info +++ b/GameServer/Server/Hotfix/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924392271 \ No newline at end of file +17446243488709721 \ No newline at end of file diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs index 36f95885..1c3e2e99 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Main")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+00a6e36d35523d79a89300cf6c917134ef1a13f8")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c3ad3113cf20a8ab062c6e6255582c0100b715d4")] [assembly: System.Reflection.AssemblyProductAttribute("Main")] [assembly: System.Reflection.AssemblyTitleAttribute("Main")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache index 149f8db4..e03edb38 100644 --- a/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache +++ b/GameServer/Server/Main/obj/Debug/net9.0/Main.AssemblyInfoInputs.cache @@ -1 +1 @@ -932444fdca88a32611b190d092645e2435aeae2d3efa5589228c3bade3e0b60a +394efb132679b18da73e9a918dca67fa1b1184f157208760d57a95961da52a2e diff --git a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache index d502bfd9..1056973f 100644 Binary files a/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache and b/GameServer/Server/Main/obj/Debug/net9.0/Main.csproj.AssemblyReference.cache differ diff --git a/GameServer/Server/Main/obj/rider.project.model.nuget.info b/GameServer/Server/Main/obj/rider.project.model.nuget.info index 1bfc59f1..9fb52111 100644 --- a/GameServer/Server/Main/obj/rider.project.model.nuget.info +++ b/GameServer/Server/Main/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17442722924402245 \ No newline at end of file +17445925598181296 \ No newline at end of file diff --git a/GameServer/Server/Main/obj/rider.project.restore.info b/GameServer/Server/Main/obj/rider.project.restore.info index 1bfc59f1..18de19b0 100644 --- a/GameServer/Server/Main/obj/rider.project.restore.info +++ b/GameServer/Server/Main/obj/rider.project.restore.info @@ -1 +1 @@ -17442722924402245 \ No newline at end of file +17446243488709721 \ No newline at end of file