1
This commit is contained in:
parent
80d754f574
commit
774638e453
@ -651,6 +651,7 @@ GameObject:
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3744406855852541135}
|
||||
- component: {fileID: 2180175338147116660}
|
||||
m_Layer: 5
|
||||
m_Name: GJSK
|
||||
m_TagString: Untagged
|
||||
@ -683,6 +684,19 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2180175338147116660
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6688080243091238059}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6d349d0bb94a29a47922da414a286f17, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_timerText: {fileID: 1198276023718990308}
|
||||
--- !u!1 &7729453330309790274
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -37358,6 +37358,7 @@ RectTransform:
|
||||
- {fileID: 6805953989209425366}
|
||||
- {fileID: 2729579121250304069}
|
||||
- {fileID: 2161047130895777792}
|
||||
- {fileID: 1439052953720149583}
|
||||
- {fileID: 1774168000858424399}
|
||||
- {fileID: 6349199766664341784}
|
||||
- {fileID: 7639078275878196855}
|
||||
@ -98459,6 +98460,112 @@ RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6403937887474270162, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
|
||||
m_PrefabInstance: {fileID: 1749071072740984990}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2309859779378909824
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1508900408836313865}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6688080243091238059, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: m_rectGjsk
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6688080243091238059, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
--- !u!224 &1439052953720149583 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3744406855852541135, guid: 7bd0c1bb782f17743978544086d6b979, type: 3}
|
||||
m_PrefabInstance: {fileID: 2309859779378909824}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2708602225140092782
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -41,7 +41,7 @@ Material:
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Alpha: 1
|
||||
- _Alpha: 0.24063015
|
||||
- _Light: 1
|
||||
- _QueueControl: 0
|
||||
- _QueueOffset: 0
|
||||
|
@ -0,0 +1,19 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
namespace GameLogic
|
||||
{
|
||||
public class UIGJSK : MonoBehaviour
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
public TextMeshProUGUI m_timerText;
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
m_timerText.text = "Time: " + DataGameSceneManager.Instance.m_GameTimerLen.ToString("F2") + "s";
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6d349d0bb94a29a47922da414a286f17
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -37,6 +37,7 @@ namespace GameLogic
|
||||
private TextMeshProUGUI m_tmpCount;
|
||||
private RawImage m_rimg_ViewTexture;
|
||||
private VideoPlayer m_video_Video;
|
||||
private RectTransform m_rectGjsk;
|
||||
private Image m_img_HuangJinShiDai;
|
||||
private Text m_textHuangJinInfo;
|
||||
private Button m_btn_StartBtn;
|
||||
@ -68,6 +69,7 @@ namespace GameLogic
|
||||
m_tmpCount = FindChildComponent<TextMeshProUGUI>("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpCount");
|
||||
m_rimg_ViewTexture = FindChildComponent<RawImage>("Bg/BattleBg/m_rimg_ViewTexture");
|
||||
m_video_Video = FindChildComponent<VideoPlayer>("Bg/BattleBg/m_video_Video");
|
||||
m_rectGjsk = FindChildComponent<RectTransform>("Bg/m_rectGjsk");
|
||||
m_img_HuangJinShiDai = FindChildComponent<Image>("Bg/m_img_HuangJinShiDai");
|
||||
m_textHuangJinInfo = FindChildComponent<Text>("Bg/m_img_HuangJinShiDai/m_textHuangJinInfo");
|
||||
m_btn_StartBtn = FindChildComponent<Button>("Bg/m_btn_StartBtn");
|
||||
@ -250,6 +252,7 @@ namespace GameLogic
|
||||
GameEvent.AddEventListener<UnitPlayerData>(EventConts.AddPlayer, AddPlayerFunc);
|
||||
GameEvent.AddEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
|
||||
GameEvent.AddEventListener(EventConts.HuangJinGameEnd, HuangJinGameEndFunc);
|
||||
GameEvent.AddEventListener(EventConts.GuanJunShiKe, GuanJunShiKeFunc);
|
||||
GameEvent.AddEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
|
||||
}
|
||||
|
||||
@ -262,10 +265,16 @@ namespace GameLogic
|
||||
GameEvent.RemoveEventListener<UnitPlayerData>(EventConts.AddPlayer, AddPlayerFunc);
|
||||
GameEvent.RemoveEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
|
||||
GameEvent.RemoveEventListener(EventConts.HuangJinGameEnd, HuangJinGameEndFunc);
|
||||
GameEvent.RemoveEventListener(EventConts.GuanJunShiKe, GuanJunShiKeFunc);
|
||||
GameEvent.RemoveEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
|
||||
}
|
||||
|
||||
|
||||
private void GuanJunShiKeFunc()
|
||||
{
|
||||
m_rectGjsk.gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
private int m_LishiId = -1;
|
||||
/// <summary>
|
||||
/// 黄金时代结束
|
||||
|
Loading…
x
Reference in New Issue
Block a user