Browse Source

修改派对细节

liuqilin 7 years ago
parent
commit
69c8fa3140

+ 65 - 0
Assets/Resource/Logo.unity

@@ -155,6 +155,70 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1 &633984190
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 633984192}
+  - component: {fileID: 633984191}
+  m_Layer: 0
+  m_Name: "\u5B9D\u7BB1"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!212 &633984191
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 633984190}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_Materials:
+  - {fileID: 2100000, guid: dc722f3566cbcf440a23d8fe69deef8e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 1cba5b42a3050e444b67311e94e9d633, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+--- !u!4 &633984192
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 633984190}
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -446,6 +510,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DebugMode: 0
+  CatchException: 0
   DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
     type: 2}
 --- !u!4 &1833966245

+ 7 - 10
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -128,6 +128,7 @@ MonoBehaviour:
   - {fileID: 1203281534794934, guid: c9dfe3f9d9cf0f2428f731dc26ac10b5, type: 2}
   - {fileID: 1494806348296548, guid: 0b51a43aa6ef9574382eb28adc6b0fa7, type: 2}
   - {fileID: 1792991775407706, guid: ce45010746b70ca40a7e91ce5a0a5e10, type: 2}
+  - {fileID: 2100000, guid: dc722f3566cbcf440a23d8fe69deef8e, type: 2}
   AtlasList:
   - {fileID: 21300004, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
   - {fileID: 21300006, guid: b31bbacb2e0ff3d459f4878983a39b50, type: 3}
@@ -193,16 +194,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: bb70c889ccbe321409013e054676a60c, type: 3}
   - {fileID: 21300000, guid: ef311f45a2bae694283ff8b6fe9188a9, type: 3}
   - {fileID: 21300000, guid: 7d6f22b630025984482ed1d75fef0fc4, type: 3}
-  EffectList:
-  - {fileID: 2100000, guid: d112dba8bb2f53941b3807271af7bc52, type: 2}
-  - {fileID: 1630066744600056, guid: 7393b86a2791bd24580de399f79a96cd, type: 2}
-  - {fileID: 2100000, guid: 9afe516b3d7c64a4f9c1f4f2b9419129, type: 2}
-  - {fileID: 2100000, guid: 8942fd58203d1864e96a484b2d1bed1f, type: 2}
-  - {fileID: 1313425893881752, guid: 57a8b1695aa497442ae16329072ca484, type: 2}
-  - {fileID: 2100000, guid: fb2dfea585d68dc47a46204dac2928d9, type: 2}
-  - {fileID: 2100000, guid: 4d62e334530548f49be56ec70f524319, type: 2}
-  - {fileID: 2100000, guid: 489ee99286fddfb47963a865d961aea0, type: 2}
-  - {fileID: 2100000, guid: 698e0e29c7d443d43ba379c4ab2f9fbb, type: 2}
+  EffectList: []
   AudioList:
   - {fileID: 8300000, guid: 998dbbd7f5820394791cae7344e31426, type: 3}
   - {fileID: 8300000, guid: c0b4387ecfdd3374698e9e5a5ae4ff8b, type: 3}
@@ -257,6 +249,11 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 187a8c01c3f18684b92532dccf8a35d4, type: 3}
   - {fileID: 21300000, guid: 1f1210050a455994aaf12f941c81ee57, type: 3}
   - {fileID: 1584217464481202, guid: 6bdee3b429ae9ea45bedbab463b1f914, type: 2}
+  - {fileID: 21300282, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
+  - {fileID: 21300280, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
+  - {fileID: 21300276, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
+  - {fileID: 21300284, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
+  - {fileID: 21300278, guid: 8d523bac11c2f3742ab88a2cbd71bf39, type: 3}
   ConfigList:
   - {fileID: 4900000, guid: f039d2181a3e9ea418ff5f211730b175, type: 3}
   - {fileID: 4900000, guid: ff8c2496a2cfe6e4eaa5262e9d7b0b2a, type: 3}

+ 6 - 6
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -679,7 +679,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1282211617929058
 GameObject:
   m_ObjectHideFlags: 1
@@ -5851,7 +5851,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: af48058312dc15c429274dc84ed7f3a6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 794f61f02d01b97429fc10046064648a, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -10164,10 +10164,10 @@ RectTransform:
   m_Father: {fileID: 224231607117232022}
   m_RootOrder: 0
   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.000045776367, y: 0.000015258789}
-  m_SizeDelta: {x: 205, y: 170}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -42, y: 42}
+  m_SizeDelta: {x: 64, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224525130383599340
 RectTransform:

+ 111 - 0
Assets/Resource/Shader/GraySprite.shader

@@ -0,0 +1,111 @@
+Shader "DashGame/GraySprite"
+{
+	Properties
+	{
+		[PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {}
+	_Color("Tint", Color) = (1,1,1,1)
+		[MaterialToggle] PixelSnap("Pixel snap", Float) = 0
+	
+		[PerRendererData] _GrayLerp("GrayLerp", range(0,1)) = 1
+		[PerRendererData] _GrayScaleX("GrayScaleX", range(0,1)) = 0.299
+		[PerRendererData] _GrayScaleY("GrayScaleY", range(0,1)) = 0.587
+		[PerRendererData] _GrayScaleZ("GrayScaleZ", range(0,1)) = 0.114
+	}
+
+		SubShader
+	{
+		Tags
+	{
+		"Queue" = "Transparent"
+		"IgnoreProjector" = "True"
+		"RenderType" = "Transparent"
+		"PreviewType" = "Plane"
+		"CanUseSpriteAtlas" = "True"
+	}
+
+		Cull Off
+		Lighting Off
+		ZWrite Off
+		Blend One OneMinusSrcAlpha
+
+		Pass
+	{
+		CGPROGRAM
+#pragma vertex vert
+#pragma fragment frag
+#pragma target 2.0
+#pragma multi_compile _ PIXELSNAP_ON
+#pragma multi_compile _ ETC1_EXTERNAL_ALPHA
+#include "UnityCG.cginc"
+
+		struct appdata_t
+	{
+		float4 vertex   : POSITION;
+		float4 color    : COLOR;
+		float2 texcoord : TEXCOORD0;
+		UNITY_VERTEX_INPUT_INSTANCE_ID
+	};
+
+	struct v2f
+	{
+		float4 vertex   : SV_POSITION;
+		fixed4 color : COLOR;
+		float2 texcoord  : TEXCOORD0;
+		UNITY_VERTEX_OUTPUT_STEREO
+	};
+
+	fixed4 _Color;
+
+	v2f vert(appdata_t IN)
+	{
+		v2f OUT;
+		UNITY_SETUP_INSTANCE_ID(IN);
+		UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
+		OUT.vertex = UnityObjectToClipPos(IN.vertex);
+		OUT.texcoord = IN.texcoord;
+		OUT.color = IN.color * _Color;
+#ifdef PIXELSNAP_ON
+		OUT.vertex = UnityPixelSnap(OUT.vertex);
+#endif
+
+		return OUT;
+	}
+
+	float _GrayLerp;
+	float _GrayScaleX;
+	float _GrayScaleY;
+	float _GrayScaleZ;
+	sampler2D _MainTex;
+	sampler2D _AlphaTex;
+
+	fixed4 SampleSpriteTexture(float2 uv)
+	{
+		fixed4 color = tex2D(_MainTex, uv);
+
+#if ETC1_EXTERNAL_ALPHA
+		// get the color from an external texture (usecase: Alpha support for ETC1 on android)
+		color.a = tex2D(_AlphaTex, uv).r;
+#endif //ETC1_EXTERNAL_ALPHA
+
+		return color;
+	}
+
+	fixed4 frag(v2f IN) : SV_Target
+	{
+		fixed4 c = SampleSpriteTexture(IN.texcoord) * IN.color;
+		c.rgb *= c.a;
+		
+		fixed gray = dot(c.rgb, fixed3(_GrayScaleX, _GrayScaleY, _GrayScaleZ));
+
+		fixed newR = lerp(c.r, gray, _GrayLerp);
+		fixed newG = lerp(c.g, gray, _GrayLerp);
+		fixed newB = lerp(c.b, gray, _GrayLerp);
+
+		c.rgb = fixed3(newR, newG, newB);
+		
+		return c;
+	}
+		ENDCG
+	}
+	}
+}

+ 9 - 0
Assets/Resource/Shader/GraySprite.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e6a7b5530b7f1a744b4f5ef5fa6f20e4
+timeCreated: 1508813784
+licenseType: Pro
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

+ 142 - 0
Assets/Resource/Shader/GraySpriteMat.mat

@@ -0,0 +1,142 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: GraySpriteMat
+  m_Shader: {fileID: 4800000, guid: e6a7b5530b7f1a744b4f5ef5fa6f20e4, type: 3}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+    - first:
+        name: _BumpMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _DetailAlbedoMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _DetailMask
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _DetailNormalMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _EmissionMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _MainTex
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _MetallicGlossMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _OcclusionMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - first:
+        name: _ParallaxMap
+      second:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - first:
+        name: PixelSnap
+      second: 0
+    - first:
+        name: _BumpScale
+      second: 1
+    - first:
+        name: _Cutoff
+      second: 0.5
+    - first:
+        name: _DetailNormalMapScale
+      second: 1
+    - first:
+        name: _DstBlend
+      second: 0
+    - first:
+        name: _GlossMapScale
+      second: 1
+    - first:
+        name: _Glossiness
+      second: 0.5
+    - first:
+        name: _GlossyReflections
+      second: 1
+    - first:
+        name: _GrayLerp
+      second: 1
+    - first:
+        name: _GrayScaleX
+      second: 0.299
+    - first:
+        name: _GrayScaleY
+      second: 0.587
+    - first:
+        name: _GrayScaleZ
+      second: 0.114
+    - first:
+        name: _Metallic
+      second: 0
+    - first:
+        name: _Mode
+      second: 0
+    - first:
+        name: _OcclusionStrength
+      second: 1
+    - first:
+        name: _Parallax
+      second: 0.02
+    - first:
+        name: _SmoothnessTextureChannel
+      second: 0
+    - first:
+        name: _SpecularHighlights
+      second: 1
+    - first:
+        name: _SrcBlend
+      second: 1
+    - first:
+        name: _UVSec
+      second: 0
+    - first:
+        name: _ZWrite
+      second: 1
+    m_Colors:
+    - first:
+        name: _Color
+      second: {r: 1, g: 1, b: 1, a: 1}
+    - first:
+        name: _EmissionColor
+      second: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/Resource/Shader/GraySpriteMat.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc722f3566cbcf440a23d8fe69deef8e
+timeCreated: 1508813799
+licenseType: Pro
+NativeFormatImporter:
+  userData: 
+  assetBundleName: ui
+  assetBundleVariant: 

+ 1 - 1
Assets/Resource/Shader/White.shader.meta

@@ -5,5 +5,5 @@ licenseType: Pro
 ShaderImporter:
   defaultTextures: []
   userData: 
-  assetBundleName: effect
+  assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
Assets/Resource/Shader/WhiteMat.mat.meta

@@ -4,5 +4,5 @@ timeCreated: 1508669764
 licenseType: Pro
 NativeFormatImporter:
   userData: 
-  assetBundleName: effect
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Resource/Sprite/Editor/SpriteUI/拍照.png


+ 68 - 0
Assets/Resource/Sprite/Editor/SpriteUI/拍照.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: 794f61f02d01b97429fc10046064648a
+timeCreated: 1508811981
+licenseType: Pro
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -154,6 +154,7 @@
     <Z_InfoLab4 desc=""><![CDATA[人员]]></Z_InfoLab4>
     <Z_InfoLab5 desc=""><![CDATA[由我创建]]></Z_InfoLab5>
     <Z_Closing desc=""><![CDATA[即将结束]]></Z_Closing>
+    <Z_Permanent desc=""><![CDATA[永久]]></Z_Permanent>
     <Z_CreateLab desc=""><![CDATA[创建房间]]></Z_CreateLab>
     <Z_Running desc=""><![CDATA[进行中]]></Z_Running>
     <Z_Full desc=""><![CDATA[已满]]></Z_Full>

+ 10 - 9
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -135,7 +135,7 @@
     <Y_GuessColorDesc desc=""><![CDATA[猜中花的顏色即可領獎,答案不帶“色”字]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[猜錯了]]></Y_GuessWrong>
     <Y_SoldOut desc=""><![CDATA[已經被搶光了]]></Y_SoldOut>
-    <Y_Unactive desc=""><![CDATA[]]></Y_Unactive>
+    <Y_Unactive desc=""><![CDATA[暫時不能領取]]></Y_Unactive>
     <Y_Refund desc=""><![CDATA[你的寶箱沒有被領取完,已返還剩餘<(鑽石)>]]></Y_Refund>
     <Yb_Minimum desc=""><![CDATA[最小20鑽石]]></Yb_Minimum>
     <Yb_GuessNumber desc=""><![CDATA[猜數字]]></Yb_GuessNumber>
@@ -147,14 +147,15 @@
     <Yb_SliderTit desc=""><![CDATA[可領]]></Yb_SliderTit>
     <Yb_SliderValueLab desc=""><![CDATA[次]]></Yb_SliderValueLab>
     <Yb_Tit desc=""><![CDATA[總價值]]></Yb_Tit>
-    <Z_InfoLab0 desc=""><![CDATA[]]></Z_InfoLab0>
-    <Z_InfoLab1 desc=""><![CDATA[]]></Z_InfoLab1>
-    <Z_InfoLab2 desc=""><![CDATA[]]></Z_InfoLab2>
-    <Z_InfoLab3 desc=""><![CDATA[]]></Z_InfoLab3>
-    <Z_InfoLab4 desc=""><![CDATA[]]></Z_InfoLab4>
-    <Z_InfoLab5 desc=""><![CDATA[]]></Z_InfoLab5>
+    <Z_InfoLab0 desc=""><![CDATA[房間號]]></Z_InfoLab0>
+    <Z_InfoLab1 desc=""><![CDATA[派對名稱]]></Z_InfoLab1>
+    <Z_InfoLab2 desc=""><![CDATA[狀態]]></Z_InfoLab2>
+    <Z_InfoLab3 desc=""><![CDATA[時長]]></Z_InfoLab3>
+    <Z_InfoLab4 desc=""><![CDATA[人員]]></Z_InfoLab4>
+    <Z_InfoLab5 desc=""><![CDATA[由我創建]]></Z_InfoLab5>
     <Z_Closing desc=""><![CDATA[即將結束]]></Z_Closing>
-    <Z_CreateLab desc=""><![CDATA[]]></Z_CreateLab>
+    <Z_Permanent desc=""><![CDATA[]]></Z_Permanent>
+    <Z_CreateLab desc=""><![CDATA[創建房間]]></Z_CreateLab>
     <Z_Running desc=""><![CDATA[進行中]]></Z_Running>
     <Z_Full desc=""><![CDATA[已滿]]></Z_Full>
     <Z_Available desc=""><![CDATA[未滿]]></Z_Available>
@@ -162,7 +163,7 @@
     <Z_RoomFull desc=""><![CDATA[派對人數已滿,無法加入]]></Z_RoomFull>
     <Z_RoomExpire desc=""><![CDATA[派對已經結束,自己創建一個吧!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[派對人數已滿]]></Z_Unknown>
-    <AA_BtnLab desc=""><![CDATA[]]></AA_BtnLab>
+    <AA_BtnLab desc=""><![CDATA[創建]]></AA_BtnLab>
     <AA_AllWhiteSpace desc=""><![CDATA[派對名字不能為空]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[名字太長]]></AA_TooLong>
     <AA_SendRequest desc=""><![CDATA[發送請求]]></AA_SendRequest>

+ 10 - 9
Assets/Resource/XML/lan/English.xml

@@ -135,7 +135,7 @@ Program 水怪
     <Y_GuessColorDesc desc=""><![CDATA[Hit the color of the flower shape. The answer can ignore case]]></Y_GuessColorDesc>
     <Y_GuessWrong desc=""><![CDATA[Wrong]]></Y_GuessWrong>
     <Y_SoldOut desc=""><![CDATA[All the treasures seemed to be gone]]></Y_SoldOut>
-    <Y_Unactive desc=""><![CDATA[]]></Y_Unactive>
+    <Y_Unactive desc=""><![CDATA[Not ready yet]]></Y_Unactive>
     <Y_Refund desc=""><![CDATA[Your treasures still left, return the rest <(Diamond)> to you already]]></Y_Refund>
     <Yb_Minimum desc=""><![CDATA[At least 20 Diamonds]]></Yb_Minimum>
     <Yb_GuessNumber desc=""><![CDATA[Number]]></Yb_GuessNumber>
@@ -147,14 +147,15 @@ Program 水怪
     <Yb_SliderTit desc=""><![CDATA[Can get]]></Yb_SliderTit>
     <Yb_SliderValueLab desc=""><![CDATA[time(s)]]></Yb_SliderValueLab>
     <Yb_Tit desc=""><![CDATA[Total]]></Yb_Tit>
-    <Z_InfoLab0 desc=""><![CDATA[]]></Z_InfoLab0>
-    <Z_InfoLab1 desc=""><![CDATA[]]></Z_InfoLab1>
-    <Z_InfoLab2 desc=""><![CDATA[]]></Z_InfoLab2>
-    <Z_InfoLab3 desc=""><![CDATA[]]></Z_InfoLab3>
-    <Z_InfoLab4 desc=""><![CDATA[]]></Z_InfoLab4>
-    <Z_InfoLab5 desc=""><![CDATA[]]></Z_InfoLab5>
+    <Z_InfoLab0 desc=""><![CDATA[ID]]></Z_InfoLab0>
+    <Z_InfoLab1 desc=""><![CDATA[Party]]></Z_InfoLab1>
+    <Z_InfoLab2 desc=""><![CDATA[Status]]></Z_InfoLab2>
+    <Z_InfoLab3 desc=""><![CDATA[Duration]]></Z_InfoLab3>
+    <Z_InfoLab4 desc=""><![CDATA[Headcount]]></Z_InfoLab4>
+    <Z_InfoLab5 desc=""><![CDATA[By me]]></Z_InfoLab5>
     <Z_Closing desc=""><![CDATA[Almost close]]></Z_Closing>
-    <Z_CreateLab desc=""><![CDATA[]]></Z_CreateLab>
+    <Z_Permanent desc=""><![CDATA[]]></Z_Permanent>
+    <Z_CreateLab desc=""><![CDATA[Create Party]]></Z_CreateLab>
     <Z_Running desc=""><![CDATA[Ongoing]]></Z_Running>
     <Z_Full desc=""><![CDATA[Full]]></Z_Full>
     <Z_Available desc=""><![CDATA[Available]]></Z_Available>
@@ -162,7 +163,7 @@ Program 水怪
     <Z_RoomFull desc=""><![CDATA[Party room is full]]></Z_RoomFull>
     <Z_RoomExpire desc=""><![CDATA[Party is over, create one by your self!]]></Z_RoomExpire>
     <Z_Unknown desc=""><![CDATA[Party room is full]]></Z_Unknown>
-    <AA_BtnLab desc=""><![CDATA[]]></AA_BtnLab>
+    <AA_BtnLab desc=""><![CDATA[Create]]></AA_BtnLab>
     <AA_AllWhiteSpace desc=""><![CDATA[Party name can not be null]]></AA_AllWhiteSpace>
     <AA_TooLong desc=""><![CDATA[Party name too long]]></AA_TooLong>
     <AA_SendRequest desc=""><![CDATA[Send request]]></AA_SendRequest>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 1 - 1
Assets/Script/Manage/Initializer.cs

@@ -191,7 +191,7 @@ public class Initializer : MonoBehaviour
     public static void Initialize()
     {
         Text debugLab = GameObject.Find("U_DebugLab").GetComponent<Text>();
-
+        
         debugLab.text = "Error code : 1";
 
         ManaTutorial.TutorialA = ManaData.GetPlayerBool("TutorialA");

+ 35 - 15
Assets/Script/Manage/ManaData.cs

@@ -63,7 +63,7 @@ public class ManaData : Regist
                         //ManaDebug.Log("Download Archive");
 
                         DamageLock = true;
-                        DownloadLock = false;
+                        SerialNumberDownloadLock = false;
 
                         return null;
                     }
@@ -112,7 +112,7 @@ public class ManaData : Regist
                                 //ManaDebug.Log("Download Archive");
 
                                 DamageLock = true;
-                                DownloadLock = false;
+                                SerialNumberDownloadLock = false;
 
                                 return null;
                             }
@@ -139,7 +139,7 @@ public class ManaData : Regist
                                 //ManaDebug.Log("Download Archive");
 
                                 DamageLock = true;
-                                DownloadLock = false;
+                                SerialNumberDownloadLock = false;
 
                                 return null;
                             }
@@ -158,7 +158,7 @@ public class ManaData : Regist
                     //ManaDebug.Log("Download Archive");
 
                     DamageLock = true;
-                    DownloadLock = false;
+                    SerialNumberDownloadLock = false;
 
                     return null;
                 }
@@ -174,7 +174,8 @@ public class ManaData : Regist
 
     public static float Timer;
     public static bool DamageLock;
-    public static bool DownloadLock;
+    public static bool IDDownloadLock;
+    public static bool SerialNumberDownloadLock = true;
     public static XmlDocument DefaultDoc = new XmlDocument();
 
     #endregion
@@ -185,7 +186,7 @@ public class ManaData : Regist
         {
             Timer += Time.deltaTime;
 
-            if (Timer >= 10)
+            if (Timer >= 30)
             {
                 DamageLock = false;
 
@@ -199,11 +200,11 @@ public class ManaData : Regist
             }
         }
 
-        if (!DownloadLock)
+        if (!SerialNumberDownloadLock)
         {   
-            if (ManaServer.ID != "Default")
+            if (ManaServer.SerialNumber != "Default")
             {
-                DownloadLock = true;
+                SerialNumberDownloadLock = true;
 
                 ManaServer.DownloadBySerialNumber(ManaServer.SerialNumber, RecoveXml);
             }
@@ -255,13 +256,10 @@ public class ManaData : Regist
             return;
         }
 
-        DamageLock = false;
-
         TextAsset textAsset = ManaReso.Load<TextAsset>("PlayerConfig", Folder.Config);
 
         DefaultDoc.LoadXml(textAsset.text);
 
-
         if (jsonData.Inst_Object.Keys.Contains("l"))
         {
             PlayerDoc_ = new XmlDocument();
@@ -270,8 +268,7 @@ public class ManaData : Regist
 
             int nativeVersion = int.Parse(PlayerDoc_.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
             int defaultVersion = int.Parse(DefaultDoc.SelectSingleNode("PlayerConfig").SelectSingleNode("Version").Attributes[0].Value);
-            //Debug.Log(nativeVersion + " " + defaultVersion);
-            //ManaDebug.Log(nativeVersion + " " + defaultVersion);
+
             if (nativeVersion < defaultVersion)
             {
                 MergeXML(nativeVersion, PlayerDoc_, DefaultDoc);
@@ -282,10 +279,33 @@ public class ManaData : Regist
             {
                 PlayerDoc_ = DefaultDoc;
             }
+
+            DamageLock = false;
         }
         else
         {
-            PlayerDoc_ = DefaultDoc;
+            if (!IDDownloadLock)
+            {
+                if (ManaServer.ID != "Default")
+                {
+                    IDDownloadLock = true;
+                    Debug.LogWarning("DownloadByID");
+
+                    ManaServer.DownloadByID(ManaServer.ID, RecoveXml);
+                }
+                else
+                {
+                    Debug.LogWarning("Use Default");
+                    PlayerDoc_ = DefaultDoc;
+                    DamageLock = false;
+                }
+            }
+            else
+            {
+                Debug.LogWarning("Use Default");
+                PlayerDoc_ = DefaultDoc;
+                DamageLock = false;
+            }
         }
     }
 

+ 3 - 2
Assets/Script/Manage/ManaServer.cs

@@ -126,9 +126,10 @@ public class ManaServer : Regist
 
         //urlData.Add("u", "vn9q1k");
 
-        //URLRequest.CreateStrURLRequest(BaseURL + "/user/load", urlData, Debug.Log, URLRequest.Method.POST);
+        //URLRequest.CreateURLRequest(BaseURL + "/user/load", urlData, (data)=> {Debug.Log(data.ToJson());}, URLRequest.Method.POST);
 
-        //URLRequestData urlData = new URLRequestData();
+
+        //urlData = new URLRequestData();
 
         //urlData.Add("u", "1709207727231988804");
 

+ 1 - 1
Assets/Script/Object/Player.cs

@@ -642,7 +642,7 @@ public class Player : Regist , IPointerClickHandler
             true,
             Curve.EaseOutQuad
         );
-        Debug.Log(ManaReso.LoadSprite("花影子", Folder.Scene));
+        //Debug.Log(ManaReso.LoadSprite("花影子", Folder.Scene));
         Shadow.GetComponent<SpriteRenderer>().sprite = ManaReso.LoadSprite("花影子", Folder.Scene);
 
         ExpressionSr = ChildDic["ExpressionSr"].GetComponent<SpriteRenderer>();

+ 16 - 0
Assets/Script/Object/PlazaRoomChest.cs

@@ -38,6 +38,10 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     private SpriteRenderer ChestSR;
     private SpriteRenderer ShadowSR;
 
+    private Material GrayMaterial;
+    private MaterialUnit MaterialUnit;
+    private TweenMatFloat MaterialTween;
+
     public static InputField InputField;
     public static PlazaRoomChest CurrentChest;
     public static PlazaRoomChest SystemChest;
@@ -166,6 +170,15 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         BaseInit(chestData);
 
+        GrayMaterial = new Material(Lib.GraySpriteMat);
+        GrayMaterial.SetFloat("_GrayLerp", 1);
+        GrayMaterial.SetFloat("_GrayScaleX", 0.299f);
+        GrayMaterial.SetFloat("_GrayScaleY", 0.587f);
+        GrayMaterial.SetFloat("_GrayScaleZ", 0.114f);
+        MaterialUnit = new MaterialUnit(GrayMaterial, transform, new List<string>() { "_GrayLerp" });
+        MaterialTween = MaterialUnit.CreateTweenMatFloat(1, 0, 0.25f, true, true, Curve.EaseOutQuad);
+        MaterialTween.OnForwardFinish = () => { ChestSR.material = ShadowSR.material; };
+
         Deactive();
 
         SystemChest = this;
@@ -235,11 +248,14 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     public void Deactive()
     {
+        ChestSR.material = GrayMaterial;
+        MaterialTween.StartBackward();
         IsActive = false;
     }
 
     public void Active()
     {
+        MaterialTween.StartForward();
         IsActive = true;
     }
 

+ 9 - 1
Assets/Script/Object/PlazaRoomItem.cs

@@ -157,7 +157,15 @@ public class PlazaRoomItem : MonoBehaviour
         }
 
         Name.text = RoomData.Name;
-        Duration.text = RoomData.Duration.ToString();
+
+        if (RoomData.IsSystemRoom)
+        {
+            Duration.text = Language.GetStr("UI", "Z_Permanent");
+        }
+        else
+        {
+            Duration.text = RoomData.Duration.ToString();
+        }
 
         RefreshStatus(true);
 

+ 5 - 1
Assets/Script/SFS/Manager/SFSPlazaRoomManager.cs

@@ -17,6 +17,7 @@ public enum JoinRoomResult
     RoomExpireError = 1,
     Unknown = 2,
     Succeed = 3,
+    Pending = 4,
 }
 
 public class SFSPlazaRoomManager 
@@ -161,7 +162,7 @@ public class SFSPlazaRoomManager
 
     public bool IsBlackMaskFinish;
     public bool EnteringPlazaRoom;
-    public JoinRoomResult JoinRoomResult;
+    public JoinRoomResult JoinRoomResult = JoinRoomResult.Pending;
 
     public Dictionary<int, PlazaRoomPlayer> UserInstanceDictionary = new Dictionary<int, PlazaRoomPlayer>();
 
@@ -217,6 +218,9 @@ public class SFSPlazaRoomManager
         if (!GardenSmartFox.PlazaRoomManager.IsBlackMaskFinish)
             return;
 
+        if (JoinRoomResult == JoinRoomResult.Pending)
+            return;
+
         if (JoinRoomResult == JoinRoomResult.Succeed)
         {
             EnterPlazaRoom();

+ 4 - 0
Assets/Script/Tool/Bundle.cs

@@ -5,7 +5,11 @@ using UnityEngine.Events;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
+
+#if UNITY_EDITOR
 using UnityEditor;
+#endif
+
 using Debug = UnityEngine.Debug;
 using Object = UnityEngine.Object;
 

+ 1 - 0
Assets/Script/Tool/DashGame/URLRequest.cs

@@ -67,6 +67,7 @@ public class URLRequest : MonoBehaviour
 	private static URLRequest CreateBaseURLRequest(string url, URLRequestData requestData = null, Method method = Method.GET, bool dataEye = false)
 	{
 		GameObject gameObj = new GameObject("URLRequest");
+        DontDestroyOnLoad(gameObj);
 		URLRequest urlRequest = gameObj.AddComponent<URLRequest>();
 
 		Debuger.Log("Url request : "+url);

+ 4 - 0
Assets/Script/Tool/Lib.cs

@@ -21,4 +21,8 @@ public class Lib
     {
         get { return ManaReso.Load<Material>("GrayMat", Folder.UI); }
     }
+    public static Material GraySpriteMat
+    {
+        get { return ManaReso.Load<Material>("GraySpriteMat", Folder.UI); }
+    }
 }

+ 4 - 5
第三期.txt

@@ -1,10 +1,7 @@
-系统房间系统宝箱的价值
-
-
-缺排行榜按钮 公告按钮 截图按钮
+更新服务器端
 
+系统房间系统宝箱的价值
 
-服务器新旧版存取档是否兼容(如果不兼容 可能无法从第二期切换到第三期) 1709207727231988804 vn9q1k
 
 关闭ManaDebug 开启CatchException
 
@@ -21,6 +18,8 @@
 IOS设置Team
 
 
+缺排行榜按钮 公告按钮
+
 内存优化(释放掉loading界面)
 
 Drawcall优化(聊天界面 表情 广场背景图片 宝箱 评论 点赞 公告 截图按钮 派对图标 上衣按钮需要打入图集)