Commit ea85cbb4 authored by shujianhe's avatar shujianhe

替换部分资源

parent b7c37095
fileFormatVersion: 2
guid: de0728e095cc4c54bbd1a5411f6b5e01
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:
fileFormatVersion: 2
guid: 1fe570d8adc45294b9355b2785e07ecb
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:
fileFormatVersion: 2
guid: 611d9cc12d2a47a4789c58dcd0441715
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:
fileFormatVersion: 2
guid: 86d5647349e28d047afd338d550d3758
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9225038afa95e3e48bacedfa2e5a7950
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:
fileFormatVersion: 2
guid: 6a5e9f8f0cf02e544864f279565a965e
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:
This diff is collapsed.
fileFormatVersion: 2
guid: b7a201f63a3f45a498ae3749a619c48c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
...@@ -70,10 +70,6 @@ public class GameScenUserInfo ...@@ -70,10 +70,6 @@ public class GameScenUserInfo
int idx = path.LastIndexOf("/"); int idx = path.LastIndexOf("/");
string dirpath = path.Substring(0, idx); string dirpath = path.Substring(0, idx);
utilsTools.CreateDirectory(dirpath);
path = getPathByFormath("temp.png");
idx = path.LastIndexOf("/");
dirpath = path.Substring(0, idx);
utilsTools.CreateDirectory(dirpath); utilsTools.CreateDirectory(dirpath);
return true; return true;
} }
......
...@@ -27,4 +27,8 @@ public class gameAreaItem ...@@ -27,4 +27,8 @@ public class gameAreaItem
{ {
return valid == 1; return valid == 1;
} }
public gameAreaItem()
{
threadHandState = 0;
}
} }
...@@ -7,9 +7,9 @@ using UnityEngine; ...@@ -7,9 +7,9 @@ using UnityEngine;
public class gameSceneAreaGroupHandler : gridView public class gameSceneAreaGroupHandler : gridView
{ {
private float itemWidth = 120f; public float itemWidth = 110f;
private float itemHeight = 120f; public float itemHeight = 110f;
private float itemInterval = 10f; public float itemInterval = 5f;
private bool isInit = false; private bool isInit = false;
private float scale = 1; private float scale = 1;
public float ItemWidth public float ItemWidth
......
...@@ -126,7 +126,7 @@ public class gameUserInfos : MonoBehaviour, IEventHandler ...@@ -126,7 +126,7 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
String url = String.Format("{0}/app/v1/game/ts/saveImgSchedule?zygt=hzwz&tgtk=1", urlRoot); String url = String.Format("{0}/app/v1/game/ts/saveImgSchedule?zygt=hzwz&tgtk=1", urlRoot);
Dictionary<String, System.Object> param1 = new Dictionary<string, System.Object>(); Dictionary<String, System.Object> param1 = new Dictionary<string, System.Object>();
param1.Add("imgId", utilsTools.getGDataByKey<int>("imgId",-1).ToString()); param1.Add("imgId", utilsTools.getGDataByKey<int>("imgId",-1).ToString());
param1.Add("uid", utilsTools.getGDataByKey<int>("uid",-1).ToString()); param1.Add("uid", utilsTools.getGDataByKey<string>("uid","-1"));
float allAreaSize = (float)utilsTools.getGDataByKey<int>("allAreaSize", 0); float allAreaSize = (float)utilsTools.getGDataByKey<int>("allAreaSize", 0);
float jindu = gameScenUserInfo.areaInfoUseData.Count / allAreaSize; float jindu = gameScenUserInfo.areaInfoUseData.Count / allAreaSize;
param1.Add("schedule",jindu.ToString()); param1.Add("schedule",jindu.ToString());
......
...@@ -17,6 +17,11 @@ public class Native : MonoBehaviour ...@@ -17,6 +17,11 @@ public class Native : MonoBehaviour
{ {
string param = utilsTools.getGDataByKey<string>("NativeTempData", "splash"); string param = utilsTools.getGDataByKey<string>("NativeTempData", "splash");
showHostMainWindow(param); showHostMainWindow(param);
utilsTools.addTimer_Sec(gameObject, "dsfds", (String name) =>
{
jumpGame("");
return false;
}, 1);
Debug.Log("UnityStart"); Debug.Log("UnityStart");
} }
private void OnEnable() private void OnEnable()
...@@ -55,7 +60,8 @@ public class Native : MonoBehaviour ...@@ -55,7 +60,8 @@ public class Native : MonoBehaviour
void jumpGame(string json) void jumpGame(string json)
{ {
Debug.Log("JSON:" + json); Debug.Log("JSON:" + json);
utilsTools.setGDataByKey("first1", false);
json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/cc--EDgRpc_nHQru7H.png\",\"hybridType\":64,\"id\":\"cc--EDgRpc_nHQru7H\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/cc--EDgRpc_nHQru7H.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
utilsTools.setGDataByKey("NativeGameData", JsonUtility.FromJson<netLableImageItem>(json)); utilsTools.setGDataByKey("NativeGameData", JsonUtility.FromJson<netLableImageItem>(json));
SceneManager.LoadScene(utilsTools.getGameSceneName()); SceneManager.LoadScene(utilsTools.getGameSceneName());
......
...@@ -133,6 +133,8 @@ public class mainGameView : MonoBehaviour ...@@ -133,6 +133,8 @@ public class mainGameView : MonoBehaviour
var tm = TaskManages.getInstance(); var tm = TaskManages.getInstance();
if(allColor.ContainsKey("line") == false) if(allColor.ContainsKey("line") == false)
allColor.Add("line", lineTexture2d.GetPixels(0, 0, gameidJsondata.width, gameidJsondata.height)); allColor.Add("line", lineTexture2d.GetPixels(0, 0, gameidJsondata.width, gameidJsondata.height));
else
allColor.Add("line", lineTexture2d.GetPixels(0, 0, gameidJsondata.width, gameidJsondata.height));
TaskItemBack taskItemBack = (System.Object[] param) => TaskItemBack taskItemBack = (System.Object[] param) =>
{ {
int start = (int)param[0]; int start = (int)param[0];
...@@ -200,7 +202,7 @@ public class mainGameView : MonoBehaviour ...@@ -200,7 +202,7 @@ public class mainGameView : MonoBehaviour
string path = gameScenUseInfo.getLocalThumbnailPath(); string path = gameScenUseInfo.getLocalThumbnailPath();
var sltTextureSize = utilsTools.getGDataByKey<Vector2>("sltTextureSize", Vector2.one); var sltTextureSize = utilsTools.getGDataByKey<Vector2>("sltTextureSize", Vector2.one);
//utilsTools.saveByteToPath(utilsTools.ScaleTexture(thumbnailTexture2d, Convert.ToInt32(sltTextureSize.x), Convert.ToInt32(sltTextureSize.y)).EncodeToJPG(), path); //utilsTools.saveByteToPath(utilsTools.ScaleTexture(thumbnailTexture2d, Convert.ToInt32(sltTextureSize.x), Convert.ToInt32(sltTextureSize.y)).EncodeToJPG(), path);
utilsTools.saveByteToPath(thumbnailTexture2d.EncodeToJPG(), path); //utilsTools.saveByteToPath(thumbnailTexture2d.EncodeToJPG(), path);
} }
return true; return true;
}, 120, 0); }, 120, 0);
...@@ -498,17 +500,17 @@ public class mainGameView : MonoBehaviour ...@@ -498,17 +500,17 @@ public class mainGameView : MonoBehaviour
idValueTran.SetLocalPositionAndRotation(localPosTemp, quaternion); idValueTran.SetLocalPositionAndRotation(localPosTemp, quaternion);
TextMeshProUGUI textMesh = idValueTran.GetComponent<TextMeshProUGUI>(); TextMeshProUGUI textMesh = idValueTran.GetComponent<TextMeshProUGUI>();
textMesh.text = (item.gid).ToString(); textMesh.text = (item.gid).ToString();
int len = GroupByAreaPtInfos.mapAllDatas[item.id].Count;
float temp = len * vector3.x;
float fontSize = item.pr; float fontSize = item.pr;
if (fontSize > showFontSizeMax) fontSize = showFontSizeMax; if (fontSize > showFontSizeMax) fontSize = showFontSizeMax;
textMesh.fontSize = fontSize; if (temp < minShowFontSize)
if ((fontSize * vector3.x) < minShowFontSize)
{ {
idValueTran.gameObject.SetActive(false); idValueTran.gameObject.SetActive(false);
} }
else else
{ {
textMesh.fontSize = fontSize;
idValueTran.gameObject.SetActive(true); idValueTran.gameObject.SetActive(true);
} }
} }
...@@ -983,12 +985,12 @@ public class mainGameView : MonoBehaviour ...@@ -983,12 +985,12 @@ public class mainGameView : MonoBehaviour
int x1 = (int)((float)x / (float)gameidJsondata.width * colorTexure2d.width); int x1 = (int)((float)x / (float)gameidJsondata.width * colorTexure2d.width);
int y1 = (int)((float)y / (float)gameidJsondata.height * colorTexure2d.height); int y1 = (int)((float)y / (float)gameidJsondata.height * colorTexure2d.height);
} }
lineTexture2d.SetPixels(0, 0, gameidJsondata.width, gameidJsondata.height, allColor["line"]);
lineTexture2d.Apply();
lowImgTexture2d.SetPixels(0, 0, gameidJsondata.width, gameidJsondata.height, allColor["low"]);
lowImgTexture2d.Apply();
TaskManages.getInstance().addTask(this, (System.Object[] _) => TaskManages.getInstance().addTask(this, (System.Object[] _) =>
{ {
lineTexture2d.SetPixels(0, 0, gameidJsondata.width, gameidJsondata.height, allColor["line"]);
lineTexture2d.Apply();
lowImgTexture2d.SetPixels(0, 0, gameidJsondata.width, gameidJsondata.height, allColor["low"]);
lowImgTexture2d.Apply();
if (utilsTools.isEqualByValue(gameScenUseInfo.progress, 1.0, 0.0000002f)) if (utilsTools.isEqualByValue(gameScenUseInfo.progress, 1.0, 0.0000002f))
{ {
TaskManages.getInstance().addTask(this, (System.Object[] parma) => TaskManages.getInstance().addTask(this, (System.Object[] parma) =>
...@@ -1249,7 +1251,7 @@ public class mainGameView : MonoBehaviour ...@@ -1249,7 +1251,7 @@ public class mainGameView : MonoBehaviour
RectTransform baseTransform = rectTransform.transform.parent.GetComponent<RectTransform>(); RectTransform baseTransform = rectTransform.transform.parent.GetComponent<RectTransform>();
Vector2 maxSize = new Vector2(baseTransform.rect.width * 0.95f,baseTransform.rect.height * 0.95f); Vector2 maxSize = new Vector2(baseTransform.rect.width * 0.95f,baseTransform.rect.height * 0.95f);
float bet1 = 1.0f; float bet1 = 1.0f;
while (true) while (false)
{ {
float tempWidth = rectTransform.rect.width * bet1 * rectTransform.localScale.x; float tempWidth = rectTransform.rect.width * bet1 * rectTransform.localScale.x;
float tempHeight = rectTransform.rect.width / bet * bet1 * rectTransform.localScale.y; float tempHeight = rectTransform.rect.width / bet * bet1 * rectTransform.localScale.y;
...@@ -1397,7 +1399,6 @@ public class mainGameView : MonoBehaviour ...@@ -1397,7 +1399,6 @@ public class mainGameView : MonoBehaviour
},15); },15);
}, aids); }, aids);
} }
} }
else{ else{
utilsTools.setGDataByKey("enableZoomMove", false); utilsTools.setGDataByKey("enableZoomMove", false);
......
...@@ -183,7 +183,7 @@ public class nodeNetProxy : MonoBehaviour ...@@ -183,7 +183,7 @@ public class nodeNetProxy : MonoBehaviour
} }
else //���û�� else //���û��
{ {
Debug.Log("Ok " + url); //Debug.Log("Ok " + url);
Texture2D texture2d = DownloadHandlerTexture.GetContent(request); Texture2D texture2d = DownloadHandlerTexture.GetContent(request);
back("", wurl, true, texture2d); back("", wurl, true, texture2d);
} }
...@@ -265,7 +265,7 @@ public class nodeNetProxy : MonoBehaviour ...@@ -265,7 +265,7 @@ public class nodeNetProxy : MonoBehaviour
StartCoroutine(loadLocalFileData("file://" + abspath, url, back)); StartCoroutine(loadLocalFileData("file://" + abspath, url, back));
else else
{ {
Debug.Log("jar:file://" + abspath); //Debug.Log("jar:file://" + abspath);
StartCoroutine(loadLocalFileData("jar:file://" + abspath, url, back)); StartCoroutine(loadLocalFileData("jar:file://" + abspath, url, back));
} }
return; return;
...@@ -275,8 +275,8 @@ public class nodeNetProxy : MonoBehaviour ...@@ -275,8 +275,8 @@ public class nodeNetProxy : MonoBehaviour
back("", url, false, null); back("", url, false, null);
return; return;
} }
Debug.Log("no find path " + localpath + " >> " + abspath); //Debug.Log("no find path " + localpath + " >> " + abspath);
Debug.Log(url); //Debug.Log(url);
nodeNetProxyItem newItem = new nodeNetProxyItem(); nodeNetProxyItem newItem = new nodeNetProxyItem();
newItem.url = url; newItem.url = url;
newItem.back = back; newItem.back = back;
...@@ -340,7 +340,7 @@ public class nodeNetProxy : MonoBehaviour ...@@ -340,7 +340,7 @@ public class nodeNetProxy : MonoBehaviour
} }
else else
{ {
Debug.Log("DonLoadImage ok"); //Debug.Log("DonLoadImage ok");
var handlerData = downloadHandler; var handlerData = downloadHandler;
string path = item.data["path"] as string; string path = item.data["path"] as string;
path = utilsTools.getWritableByPath(path); path = utilsTools.getWritableByPath(path);
......
...@@ -10,10 +10,12 @@ using UnityEngine; ...@@ -10,10 +10,12 @@ using UnityEngine;
public class utilsDB public class utilsDB
{ {
private static SqlHelper db = null; private static SqlHelper db = null;
private static bool isInitEnd = false; private static bool isInitEnd = false;
private static Dictionary<string, Dictionary<String, List<System.Object>>> debugDBTables = new Dictionary<string, Dictionary<string, List<System.Object>>>(); private static Dictionary<string, Dictionary<String, List<System.Object>>> debugDBTables = new Dictionary<string, Dictionary<string, List<System.Object>>>();
static utilsDB() static utilsDB()
{ {
PlayerPrefs.DeleteAll();
string path = utilsTools.copyFile("tsmi.db"); string path = utilsTools.copyFile("tsmi.db");
if(path.Equals("") == true) if(path.Equals("") == true)
{ {
...@@ -138,40 +140,52 @@ public class utilsDB ...@@ -138,40 +140,52 @@ public class utilsDB
} }
keys.Add(key); keys.Add(key);
debugDBTables["hashkvs"]["value"].Add(value); debugDBTables["hashkvs"]["value"].Add(value);
} }
return true; return true;
} }
public static int getDBIntDataByKey(string key,int defvalue) public static int getDBIntDataByKey(string key,int defvalue)
{ {
defvalue = PlayerPrefs.GetInt(key, defvalue);
return Int32.Parse(getDBValueDataByKey<int>(key, "int", defvalue)); return Int32.Parse(getDBValueDataByKey<int>(key, "int", defvalue));
} }
public static bool setDBIntDataByKey(string key, int value) public static bool setDBIntDataByKey(string key, int value)
{ {
if (db == null)
PlayerPrefs.SetInt(key, value);
return setDBValueDataByKey<int>(key, "int", value); return setDBValueDataByKey<int>(key, "int", value);
} }
public static bool setDBBoolDataByKey(string key, bool value) public static bool setDBBoolDataByKey(string key, bool value)
{ {
if (db == null)
PlayerPrefs.SetInt(key, value ? 1 : 0);
return setDBValueDataByKey<bool>(key, "bool", value); return setDBValueDataByKey<bool>(key, "bool", value);
} }
public static bool getDBBoolDataByKey(string key, bool defvalue) public static bool getDBBoolDataByKey(string key, bool defvalue)
{ {
defvalue = PlayerPrefs.GetInt(key,defvalue ? 1 : 0) == 1;
return Boolean.Parse(getDBValueDataByKey<bool>(key, "bool", defvalue).ToSafeString()); return Boolean.Parse(getDBValueDataByKey<bool>(key, "bool", defvalue).ToSafeString());
} }
public static string getDBStringDataByKey(string key, string defvalue) public static string getDBStringDataByKey(string key, string defvalue)
{ {
defvalue = PlayerPrefs.GetString(key, defvalue);
return getDBValueDataByKey<string>(key, "string", defvalue); return getDBValueDataByKey<string>(key, "string", defvalue);
} }
public static bool setDBStringDataByKey(string key, string value) public static bool setDBStringDataByKey(string key, string value)
{ {
if (db == null)
PlayerPrefs.SetString(key, value);
return setDBValueDataByKey<string>(key, "string", value); return setDBValueDataByKey<string>(key, "string", value);
} }
public static string getDBJsonDataByKey(string key, string defvalue) public static string getDBJsonDataByKey(string key, string defvalue)
{ {
defvalue = PlayerPrefs.GetString(key, defvalue);
return getDBValueDataByKey<string>(key, "string", defvalue); return getDBValueDataByKey<string>(key, "string", defvalue);
} }
public static bool setDBJsonDataByKey(string key, string value) public static bool setDBJsonDataByKey(string key, string value)
{ {
if (db == null)
PlayerPrefs.SetString(key, value);
return setDBValueDataByKey<string>(key, "string", value); return setDBValueDataByKey<string>(key, "string", value);
} }
public static List<ScenePageCellGroupItemData> getScenePageCellGroupDataByDB() public static List<ScenePageCellGroupItemData> getScenePageCellGroupDataByDB()
......
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