From 5bdb8312a3dc0daef68b3a61f978fb9b1b820520 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 21:03:24 +0800 Subject: [PATCH] 111 --- Configs/GameConfig/Datas/TeamConfig.xlsx | Bin 13032 -> 13032 bytes .../bytes/teamconfig_tbteamconfig.bytes | Bin 2116 -> 2153 bytes .../Assets/AssetRaw/UI/UIGameBattle.prefab | 148 +++++++++++++++++- .../UIRaw/Raw/Ls_Texture.renderTexture | 40 +++++ .../UIRaw/Raw/Ls_Texture.renderTexture.meta | 8 + .../GameLogic/Manager/DataGameSceneManager.cs | 3 +- .../HotFix/GameLogic/UI/UIGameBattle.cs | 47 ++++-- 7 files changed, 227 insertions(+), 19 deletions(-) create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture create mode 100644 UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture.meta diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index 126b6b8a54d55056f2bb068151f520af6ec236f5..5be82ed6e65e1756d821293e779df5dd7e26c0cb 100644 GIT binary patch delta 4652 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 diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index c04bef1a9645daf630c3d926b5cdd4e3596028ba..5ce34e5fb2dca040f0613276519a0a3f2e85aee3 100644 GIT binary patch delta 119 zcmV--0Eqv@5a|$*92^Yifve}Ijpw?m<%NR`>5{wVoT%lGmgj-1fS;3~0~oPCd;tv% z>7A14lbq*+?0Syf2l(pxhf#s!#=)bwMo&(1L4GigrkL9h9>6)kKslT&r Z1w{c34CjHh=AgOgr-|u?lC!!7iUD+kLB9Y1 delta 76 zcmaDUa718&3?~D7MpkiFd}Z-QvuTVR5Kel^=9`R{VZ8F3%{!To!*~@bn|oPZ;k=5? I_u0A_0SzS^HUIzs diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index cf55af15..554b05fb 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -42329,6 +42329,78 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &3479591696337344486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7899675927470627657} + - component: {fileID: 2796935496239332376} + m_Layer: 5 + m_Name: m_video_SjVideo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7899675927470627657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3479591696337344486} + 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: 1774168000858424399} + 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.5, y: 731.99567} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!328 &2796935496239332376 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3479591696337344486} + m_Enabled: 1 + m_VideoClip: {fileID: 0} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 77dd7813972dabe4284a1ed9a9b336ce, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: + m_RenderMode: 2 + m_AspectRatio: 2 + m_DataSource: 0 + m_TimeUpdateMode: 2 + m_PlaybackSpeed: 1 + m_AudioOutputMode: 2 + m_TargetAudioSources: + - {fileID: 0} + m_DirectAudioVolumes: + - 1 + m_Url: + m_EnabledAudioTracks: 01 + m_DirectAudioMutes: 00 + m_ControlledAudioTrackCount: 1 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 0 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 + m_VideoShaders: [] --- !u!1 &3688675632854108129 GameObject: m_ObjectHideFlags: 0 @@ -47762,6 +47834,78 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4545170508472268965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2590680805909853394} + - component: {fileID: 2891097312864038662} + - component: {fileID: 289569791263026438} + m_Layer: 5 + m_Name: m_rimg_ViewSjTexture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2590680805909853394 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4545170508472268965} + 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: 1774168000858424399} + 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: -1.5, y: 731.71} + m_SizeDelta: {x: 1080, y: 2340} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2891097312864038662 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4545170508472268965} + m_CullTransparentMesh: 1 +--- !u!114 &289569791263026438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4545170508472268965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 77dd7813972dabe4284a1ed9a9b336ce, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &4597154706340645414 GameObject: m_ObjectHideFlags: 0 @@ -98305,6 +98449,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7899675927470627657} + - {fileID: 2590680805909853394} - {fileID: 185706832472226134} m_Father: {fileID: 1508900408836313865} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -98328,7 +98474,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8959076514524919582} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture new file mode 100644 index 00000000..7bac46f0 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ls_Texture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 + m_Width: 1080 + m_Height: 2340 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture.meta b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture.meta new file mode 100644 index 00000000..76563016 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Raw/Ls_Texture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77dd7813972dabe4284a1ed9a9b336ce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index ee9f231d..9d9c39db 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -39,7 +39,7 @@ namespace GameLogic public long m_AllTeamPush = 0; - public int m_TeamId = 1;// 当前朝代Id + public int m_TeamId = 0;// 当前朝代Id public bool isLiShiShiJian = false; // 是否是历史事件 public int m_LiShiShiJianLikeCount = 0; // 历史事件点赞触发条件 public int m_LiShiShiJianLikeCountMax = 200; // 历史事件点赞触发条件最大值 @@ -804,7 +804,6 @@ namespace GameLogic } //Log.Debug("当前朝代id" + id); - // 选出当前朝代Id if (id != m_TeamId) { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 1472ee32..80725ac0 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -42,6 +42,8 @@ namespace GameLogic private TextMeshProUGUI m_tmp_PlayerName; private RectTransform m_rectGjsk; private Image m_img_HuangJinShiDai; + private VideoPlayer m_video_SjVideo; + private RawImage m_rimg_ViewSjTexture; private Text m_textHuangJinInfo; private Button m_btn_StartBtn; private RectTransform m_rect_ShiJian; @@ -77,6 +79,8 @@ namespace GameLogic m_tmp_PlayerName = FindChildComponent("Bg/m_rect_Dz/Icon/m_tmp_PlayerName"); m_rectGjsk = FindChildComponent("Bg/m_rectGjsk"); m_img_HuangJinShiDai = FindChildComponent("Bg/m_img_HuangJinShiDai"); + m_video_SjVideo = FindChildComponent("Bg/m_img_HuangJinShiDai/m_video_SjVideo"); + m_rimg_ViewSjTexture = FindChildComponent("Bg/m_img_HuangJinShiDai/m_rimg_ViewSjTexture"); m_textHuangJinInfo = FindChildComponent("Bg/m_img_HuangJinShiDai/m_textHuangJinInfo"); m_btn_StartBtn = FindChildComponent