Skip to content

T
tuseGameColor
Commit 18f481ea authored by shujianhe's avatar shujianhe
Browse files
Options

1 修复定位设置缩放不生效和 

2 加载时隐藏头部
3 提示和进度条层级调整
4 添加回放场景 非完成时
parent 05562894
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1960 additions and 70 deletions
Assets/Resources/commons/foreground/backjiantou.png.meta 0 → 100644
View file @ 18f481ea
fileFormatVersion: 2
guid: 5aa39f69ecf89b74ba46bfcd17e38676
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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: 1
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: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/perfabs/gameViewLogic.prefab
View file @ 18f481ea
......@@ -207,13 +207,13 @@ RectTransform:
- {fileID: 9202005404466210624}
- {fileID: 3684281432546734940}
- {fileID: 7778848243247776032}
- {fileID: 1682976293997861255}
- {fileID: 4207755507653322023}
- {fileID: 1976999355571500960}
- {fileID: 1682976293997861255}
- {fileID: 4930126960711289547}
- {fileID: 2488998574890369715}
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
......@@ -3515,7 +3515,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 2545109457425451164}
m_Direction: 0
m_Value: 1
m_Size: 0.9999999
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -4499,17 +4499,29 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 3684281432546734940}
m_Modifications:
- target: {fileID: 1583902233695634631, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1583902233695634631, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1583902233695634631, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1643446527150243925, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_text
value:
objectReference: {fileID: 0}
- target: {fileID: 3386487943296901383, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_SizeDelta.x
value: 76
value: 50
objectReference: {fileID: 0}
- target: {fileID: 3386487943296901383, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_SizeDelta.y
value: 76
value: 86
objectReference: {fileID: 0}
- target: {fileID: 4790972399934209839, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Name
......@@ -4518,7 +4530,7 @@ PrefabInstance:
- target: {fileID: 4796231568445269378, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: e1eef2725d332cf4d91faeb733b94b32, type: 3}
objectReference: {fileID: 21300000, guid: 5aa39f69ecf89b74ba46bfcd17e38676, type: 3}
- target: {fileID: 5667027781148436514, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
propertyPath: m_AnchoredPosition.y
value: -128
......
Assets/Scenes/gameScene.unity
View file @ 18f481ea
......@@ -495,27 +495,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y
value: -464
value: 2302
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -611,27 +611,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y
value: -464
value: 2302
objectReference: {fileID: 0}
- target: {fileID: 3575847236156162491, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -655,27 +655,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y
value: -464
value: 2302
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -739,27 +739,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 1920
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y
value: -464
value: 2302
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
......@@ -789,6 +789,10 @@ PrefabInstance:
propertyPath: m_Color.a
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6769909122946713645, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6820487704364807529, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 6
......
Assets/Scenes/replayeScene.unity 0 → 100644
View file @ 18f481ea
This diff is collapsed.
Assets/Scenes/replayeScene.unity.meta 0 → 100644
View file @ 18f481ea
fileFormatVersion: 2
guid: dbc1824bdb7f5934d990c959946587ab
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/scripts/Views/gameScene/gameSceneLogic.cs
View file @ 18f481ea
......@@ -71,6 +71,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
transform.Find("gameEndOperBase").gameObject.SetActive(false);
transform.Find("gameEndOperBase").GetComponent<gameEndLogic>().initMember();
transform.Find("tipSelectGroup").gameObject.SetActive(false);
transform.Find("top").gameObject.SetActive(false);
utilsTools.addTimer_Sec(gameObject, "loopGetHot", (String name) =>
{
addHotParams<float>("TUSE_doubleTouchScale", "doubleTouchScale", float.TryParse);
......@@ -268,6 +269,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
areaGroupList.SetActive(true);
RectTransform rectTransform = areaGroupList.GetComponent<RectTransform>();
transform.Find("ingameLoad").gameObject.SetActive(false);
transform.Find("top").gameObject.SetActive(true);
utilsTools.setGDataByKey("loadingEnd", utilsTools.getTotalMillisecond());
RectTransform transform1 = transform.Find("gameProgressText").GetComponent<RectTransform>();
float offsetY = 0 - utilsTools.DisplaySize.y/2 + rectTransform.rect.yMax;
......@@ -284,31 +286,22 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
{
Debug.Log("handlerLoadingPosition hand endl");
transform.Find("ingameLoad/loadImg").gameObject.SetActive(true);
//utilsTools.setGDataByKey("downGaoQingBack", utilsTools.getTotalMillisecond());
//float width = image.sprite.texture.width;
//float height = image.sprite.texture.height;
//float bet = width / height;
//RectTransform rectTransform = image.GetComponent<RectTransform>();
//RectTransform baseTransform = rectTransform.transform.parent.GetComponent<RectTransform>();
//Vector2 maxSize = new Vector2(baseTransform.rect.width * 0.9f, baseTransform.rect.height * 0.9f);
//float bet1 = 1.0f;
//while (true)
//{
// float tempWidth = rectTransform.rect.width * bet1 * rectTransform.localScale.x;
// float tempHeight = rectTransform.rect.width / bet * bet1 * rectTransform.localScale.y;
// if (tempWidth < maxSize.x && tempHeight < maxSize.y)
// {
// width = tempWidth;
// height = tempHeight;
// break;
// }
// bet1 = bet1 * 0.95f;
//}
//rectTransform.sizeDelta = new Vector2(width, height);
//rectTransform.localPosition = new Vector2(0, 10f);
//var rectTransform1 = transform.Find("ingameLoad/loadingbar").GetComponent<RectTransform>();
//rectTransform1.localPosition = new Vector2(0, rectTransform.rect.yMin - 45f);
//rectTransform1.sizeDelta = new Vector2(width * 0.85f, 35f);
utilsTools.setGDataByKey("downGaoQingBack", utilsTools.getTotalMillisecond());
float width = image.sprite.texture.width;
float height = image.sprite.texture.height;
float bet = width / height;
RectTransform rectTransform = image.GetComponent<RectTransform>();
RectTransform baseTransform = rectTransform.transform.parent.GetComponent<RectTransform>();
if (width.Equals(height))
{
return;
}
Vector2 size = new Vector2(rectTransform.rect.width, rectTransform.rect.width * 2);
var rectTransform1 = transform.Find("ingameLoad/loadingbar").GetComponent<RectTransform>();
float diff = rectTransform1.localPosition.y - rectTransform.localPosition.y;
rectTransform.sizeDelta = size;
rectTransform1.localPosition = new Vector2(0, diff - size.x/2);
rectTransform1.sizeDelta = new Vector2(rectTransform1.sizeDelta.x, 35f);
}
int onDownColorImgHandler(string id, string url, bool isSuccess, System.Object data, string localpath)
{
......
Assets/scripts/Views/replayerScene.meta 0 → 100644
View file @ 18f481ea
fileFormatVersion: 2
guid: 160f7d0877669c14dacd30540847316c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/scripts/Views/replayerScene/replayerBack.cs 0 → 100644
View file @ 18f481ea
using Assets.scripts.utils;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class replayerBack : MonoBehaviour
{
Dictionary<string, EventChildItemBack> childEventHandlers = new Dictionary<string, EventChildItemBack>();
void onEvent(string name, EventChildItemBack func)
{
utilsTools.onEvent(this, name);
childEventHandlers.Add(name, func);
}
// Start is called before the first frame update
void Start()
{
onEvent("initViewShowData", onInitViewShowDataEvent);
}
private void onInitViewShowDataEvent(List<UnityEngine.Object> uobjects, List<object> objects)
{
}
// Update is called once per frame
void Update()
{
}
public void onBack()
{
}
public void onDelete()
{
}
public void onReset()
{
Debug.Log(VideoHelp.getDllVersion());
}
public void onContinue()
{
}
}
Assets/scripts/Views/replayerScene/replayerBack.cs.meta 0 → 100644
View file @ 18f481ea
fileFormatVersion: 2
guid: 77996d411384a5d46b470421ba47a906
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/scripts/common/mainGameView.cs
View file @ 18f481ea
......@@ -12,7 +12,6 @@ using UnityEngine.UI;
using System.Threading;
using TMPro;
using Unity.VisualScripting;
using UnityEditor;
public class mainGameView : MonoBehaviour
{
......@@ -1257,22 +1256,35 @@ public class mainGameView : MonoBehaviour
RectTransform baseTransform = rectTransform.transform.parent.GetComponent<RectTransform>();
Vector2 maxSize = new Vector2(baseTransform.rect.width * 0.95f,baseTransform.rect.height * 0.95f);
float bet1 = 1.0f;
while (false)
//while (true)
//{
// float tempWidth = rectTransform.rect.width * bet1 * rectTransform.localScale.x;
// float tempHeight = rectTransform.rect.width / bet * bet1 * rectTransform.localScale.y;
// if (tempWidth < maxSize.x && tempHeight < maxSize.y)
// {
// width = tempWidth;
// height = tempHeight;
// break;
// }
// bet1 = bet1 * 0.95f;
//}
if (width.Equals(height))
{
width = utilsTools.DisplaySize.x * 1;
height = width;
}
else
{
float tempWidth = rectTransform.rect.width * bet1 * rectTransform.localScale.x;
float tempHeight = rectTransform.rect.width / bet * bet1 * rectTransform.localScale.y;
if(tempWidth < maxSize.x && tempHeight < maxSize.y)
{
width = tempWidth;
height = tempHeight;
break;
}
bet1 = bet1 * 0.95f;
width = utilsTools.DisplaySize.x * 0.65f;
height = width * 2;
}
//确定好宽高后赋值
GameObject[] gameObjects = { lineImg, colorImg, lowImg, areaIdBase };
Vector3 tempPos = new Vector3();
Quaternion quaternion;
Vector3 tempPos = rectTransform.localPosition;
if (width.Equals(height) == false)
{
tempPos.y = tempPos.y - 40;
}
foreach (var item in gameObjects)
{
if (item == null) continue;
......
Assets/scripts/utils/utilsTools.cs
View file @ 18f481ea
......@@ -108,8 +108,7 @@ public class utilsTools
}
set
{
if (displaySize.x > 1) return;
displaySize = value;
displaySize = value;// new Vector2(Screen.width,Screen.height);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment