diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index 126b6b8a..5be82ed6 100644 Binary files a/Configs/GameConfig/Datas/TeamConfig.xlsx and b/Configs/GameConfig/Datas/TeamConfig.xlsx differ diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index c04bef1a..5ce34e5f 100644 Binary files a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes and b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes differ 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