新增-抽奖

Assets/Advertisements/Editor/Resources/Android/builds.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 8d2d384f78b29a44a9c70c3daf45d1cb
-folderAsset: yes
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Advertisements/Editor/Resources/iOS/builds.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f533cc2da3e36884f93fdd5dc9124f8c
-folderAsset: yes
-timeCreated: 1494301205
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -120,6 +120,7 @@ MonoBehaviour:
   - {fileID: 21300076, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
   - {fileID: 21300078, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
   - {fileID: 21300080, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
+  - {fileID: 21300000, guid: b302746e597587e4ea2e8d2e9765a58c, type: 3}
   Atlas2List:
   - {fileID: 21300030, guid: ff54675045a50274cb3e0094de4954e5, type: 3}
   - {fileID: 21300024, guid: ff54675045a50274cb3e0094de4954e5, type: 3}

Assets/Resource/Prefab/Object/Flower.prefab

@@ -57,7 +57,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1172671826056066
 GameObject:
   m_ObjectHideFlags: 1
@@ -152,7 +152,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1461013279868422
 GameObject:
   m_ObjectHideFlags: 1
@@ -397,7 +397,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1460319548908584}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1, y: 0, z: -0.1}
+  m_LocalPosition: {x: -0.75, y: 0, z: -0.1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4157267071062646}

Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -29,6 +29,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1054298316658618
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224407263663310552}
+  m_Layer: 5
+  m_Name: Bc_LotteryBK21
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1063816939715054
 GameObject:
   m_ObjectHideFlags: 1
@@ -305,6 +320,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1266812866896468
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224621130213581382}
+  m_Layer: 5
+  m_Name: Bc_LotteryBK11
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1270118006178858
 GameObject:
   m_ObjectHideFlags: 1
@@ -392,6 +422,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1325774275084946
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224203049817557324}
+  m_Layer: 5
+  m_Name: Bc_LotteryBK31
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1329374165606282
 GameObject:
   m_ObjectHideFlags: 1
@@ -507,7 +552,7 @@ GameObject:
   - component: {fileID: 222947795752814190}
   - component: {fileID: 114138649362589348}
   m_Layer: 5
-  m_Name: Bc_LotteryBK1
+  m_Name: Bc_LotteryBK12
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -592,7 +637,7 @@ GameObject:
   - component: {fileID: 222144234251602748}
   - component: {fileID: 114086581405551534}
   m_Layer: 5
-  m_Name: Bc_LotteryBK2
+  m_Name: Bc_LotteryBK22
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1123,7 +1168,7 @@ GameObject:
   - component: {fileID: 222093999133919174}
   - component: {fileID: 114565133341692612}
   m_Layer: 5
-  m_Name: Bc_LotteryBK3
+  m_Name: Bc_LotteryBK32
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1655,8 +1700,8 @@ 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: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1772,8 +1817,8 @@ 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: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2183,7 +2228,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: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3106d8c2326f9b2419c5b2a8139393c9, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2304,7 +2349,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: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3106d8c2326f9b2419c5b2a8139393c9, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2720,7 +2765,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: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3106d8c2326f9b2419c5b2a8139393c9, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3009,8 +3054,8 @@ 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: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 9581ccebf924e0d40bc15fdadc255351, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -4298,7 +4343,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224195307125891872}
+  - {fileID: 224203049817557324}
   - {fileID: 224961426753062120}
   m_Father: {fileID: 224847814436123234}
   m_RootOrder: 2
@@ -4427,7 +4472,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224094529361259848}
+  m_Father: {fileID: 224203049817557324}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4435,6 +4480,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 144.3, y: 144.3}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224203049817557324
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1325774275084946}
+  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:
+  - {fileID: 224195307125891872}
+  m_Father: {fileID: 224094529361259848}
+  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, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224225948553169580
 RectTransform:
   m_ObjectHideFlags: 1
@@ -4445,7 +4509,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224928266697132482}
+  - {fileID: 224407263663310552}
   - {fileID: 224782786808807644}
   m_Father: {fileID: 224847814436123234}
   m_RootOrder: 1
@@ -4653,7 +4717,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224664466603613810}
+  - {fileID: 224621130213581382}
   - {fileID: 224076702204112392}
   m_Father: {fileID: 224847814436123234}
   m_RootOrder: 0
@@ -4772,6 +4836,25 @@ RectTransform:
   m_AnchoredPosition: {x: 50, y: -165.99998}
   m_SizeDelta: {x: 384, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224407263663310552
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1054298316658618}
+  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:
+  - {fileID: 224928266697132482}
+  m_Father: {fileID: 224225948553169580}
+  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, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224412367917070618
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5055,6 +5138,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 125, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224621130213581382
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1266812866896468}
+  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:
+  - {fileID: 224664466603613810}
+  m_Father: {fileID: 224360094721010652}
+  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, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224664466603613810
 RectTransform:
   m_ObjectHideFlags: 1
@@ -5065,7 +5167,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224360094721010652}
+  m_Father: {fileID: 224621130213581382}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -5512,7 +5614,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224225948553169580}
+  m_Father: {fileID: 224407263663310552}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -2340,7 +2340,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u89E3\u9501"
+  m_Text: "\u89E3\u9501<(\u91D1\u5E01>10000"
   Draw: 0
   LineHeight: 0
   RemovePos: 
@@ -3227,7 +3227,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: -26.7}
+  m_SizeDelta: {x: 30.4, y: -21.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224216108787610140
 RectTransform:

Assets/Resource/Sprite/SpriteUI/抽奖图标.png.meta

@@ -0,0 +1,68 @@
+fileFormatVersion: 2
+guid: b302746e597587e4ea2e8d2e9765a58c
+timeCreated: 1501153713
+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: 

Assets/Resource/Sprite/SpriteUI/方格背面.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 3106d8c2326f9b2419c5b2a8139393c9
+timeCreated: 1501153678
+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
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+  spritePackingTag: UI
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resource/XML/Config/lottery_config.xml

@@ -1,8 +1,8 @@
 <data>
   <item id="1" type="1" rate="0.25" left_border="100000" right_border="200000" />
   <item id="2" type="2" rate="0.25" left_border="100" right_border="200" />
-  <item id="3" type="3" rate="0" left_border="2,11" right_border="10,20" />
-  <item id="4" type="4" rate="0.5" left_border="2" right_border="20" />
+  <item id="3" type="3" rate="0.25" left_border="3" right_border="36" />
+  <item id="4" type="4" rate="0.25" left_border="2,201" right_border="30,217" />
   <comment>
     <id>
 id

Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -59,6 +59,7 @@
     <Bb_Title desc=""><![CDATA[每日签到]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[确定]]></Bb_ConfirmLab>
     <Bc_Lab desc=""><![CDATA[请选择一个]]></Bc_Lab>
+    <Bc_Lab1 desc=""><![CDATA[获得了 ]]></Bc_Lab1>
     <Bc_ConfirmLab desc=""><![CDATA[确定]]></Bc_ConfirmLab>
     <L_Tit desc=""><![CDATA[设置]]></L_Tit>
     <L_UserTit desc=""><![CDATA[用户]]></L_UserTit>
@@ -235,6 +236,7 @@
     <Star desc=""><![CDATA[小游戏冷却时间减少]]></Star>
   </Object>
   <Common>
+    <Coin desc=""><![CDATA[金币]]></Coin>
     <Diamond desc=""><![CDATA[钻石]]></Diamond>
     <Confirm desc=""><![CDATA[确定]]></Confirm>
     <Cancel desc=""><![CDATA[取消]]></Cancel>

Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -59,6 +59,7 @@
     <Bb_Title desc=""><![CDATA[每日簽到]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[確定]]></Bb_ConfirmLab>
     <Bc_Lab desc=""><![CDATA[請選擇一個]]></Bc_Lab>
+    <Bc_Lab1 desc=""><![CDATA[獲得了 ]]></Bc_Lab1>
     <Bc_ConfirmLab desc=""><![CDATA[確定]]></Bc_ConfirmLab>
     <L_Tit desc=""><![CDATA[設置]]></L_Tit>
     <L_UserTit desc=""><![CDATA[用戶]]></L_UserTit>
@@ -235,6 +236,7 @@
     <Star desc=""><![CDATA[小遊戲冷卻時間減少]]></Star>
   </Object>
   <Common>
+    <Coin desc=""><![CDATA[金幣]]></Coin>
     <Diamond desc=""><![CDATA[鉆石]]></Diamond>
     <Confirm desc=""><![CDATA[確定]]></Confirm>
     <Cancel desc=""><![CDATA[取消]]></Cancel>

Assets/Resource/XML/lan/English.xml

@@ -59,6 +59,7 @@
     <Bb_Title desc=""><![CDATA[Sign In]]></Bb_Title>
     <Bb_ConfirmLab desc=""><![CDATA[Confirm]]></Bb_ConfirmLab>
     <Bc_Lab desc=""><![CDATA[Please pick one]]></Bc_Lab>
+    <Bc_Lab1 desc=""><![CDATA[Get ]]></Bc_Lab1>
     <Bc_ConfirmLab desc=""><![CDATA[Confirm]]></Bc_ConfirmLab>
     <L_Tit desc=""><![CDATA[Setting]]></L_Tit>
     <L_UserTit desc=""><![CDATA[User]]></L_UserTit>
@@ -235,6 +236,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack6>
     <Star desc=""><![CDATA[Reduce minigame cd ]]></Star>
   </Object>
   <Common>
+    <Coin desc=""><![CDATA[Coin]]></Coin>
     <Diamond desc=""><![CDATA[Diamond]]></Diamond>
     <Confirm desc=""><![CDATA[Confirm]]></Confirm>
     <Cancel desc=""><![CDATA[Cancel]]></Cancel>

Assets/Script/Manage/ManaAchieve.cs

@@ -421,7 +421,7 @@ public class Achieve
 
     public static string GetDescription(string desc, double value)
     {
-        return desc.Replace("[&value&]", value.ToString("0"));
+        return desc.Replace("[&value&]", Auxiliary.ShrinkNumberStr(value, 0));
     }
 }
 

Assets/Script/Manage/ManaSign.cs

@@ -159,8 +159,8 @@ public class Sign
     {
         if (IsLottery)
         {
-            Icon.sprite = ManaReso.LoadSprite("Water", Folder.UI);
-            Icon.Resize(true, 0.1f, 0.1f);
+            Icon.sprite = ManaReso.LoadSprite("抽奖图标", Folder.UI);
+            Icon.Resize(true, 0.3f, 0.3f);
 
             return;
         }
@@ -232,12 +232,13 @@ public class Lottery
     public int Type;
     public int Value;
     public Text Lab;
-    public Image BK;
+    public Transform BK;
     public Image Icon1;
     public Image Icon2;
     public Button Button;
 
     public static List<int> TypeList = new List<int>();
+    public static List<int> ValueList = new List<int>();
     public static List<float> RateList = new List<float>();
     public static List<Vector3> PosList = new List<Vector3>();
     public static List<List<int>> LeftBorderDList = new List<List<int>>();
@@ -286,7 +287,7 @@ public class Lottery
         #endregion
 
         float random = Random.Range(0f, 1f);
-        
+
         for (int i = 0; i < RateList.Count; i++)
         {
             if (random <= RateList.MySum(f => f, i + 1))
@@ -303,7 +304,7 @@ public class Lottery
                     {
                         for (int k = LeftBorderDList[i][j]; k < RightBorderDList[i][j] + 1; k++)
                         {
-                            if (!ManaGarden.FlowerInfoDic[k].Unlock)
+                            if (!ManaGarden.FlowerInfoDic[k].Unlock && !ValueList.Contains(k))
                             {
                                 allUnlock = false;
                                 
@@ -347,7 +348,9 @@ public class Lottery
 
                             lottery.Value = Random.Range(LeftBorderDList[i][index], RightBorderDList[i][index] + 1);
                         }
-                        while (ManaGarden.FlowerInfoDic[lottery.Value].Unlock);
+                        while (ManaGarden.FlowerInfoDic[lottery.Value].Unlock || ValueList.Contains(lottery.Value));
+
+                        ValueList.Add(lottery.Value);
                     }
 
                     #endregion
@@ -362,7 +365,7 @@ public class Lottery
                     {
                         for (int k = LeftBorderDList[i][j]; k < RightBorderDList[i][j] + 1; k++)
                         {
-                            if (!ManaPlayer.CloseUnitDic[k].Bought)
+                            if (!ManaPlayer.CloseUnitDic[k].Bought && !ValueList.Contains(k))
                             {
                                 allBought = false;
                                 
@@ -406,7 +409,9 @@ public class Lottery
 
                             lottery.Value = Random.Range(LeftBorderDList[i][index], RightBorderDList[i][index] + 1);
                         }
-                        while (ManaPlayer.CloseUnitDic[lottery.Value].Bought);
+                        while (ManaPlayer.CloseUnitDic[lottery.Value].Bought || ValueList.Contains(lottery.Value));
+
+                        ValueList.Add(lottery.Value);
                     }
 
                     #endregion
@@ -423,7 +428,7 @@ public class Lottery
         }
 
 
-        lottery.BK = lotteryItem.GetChild(0).GetComponent<Image>();
+        lottery.BK = lotteryItem.GetChild(0);
         lottery.Icon1 = lotteryItem.GetChild(1).GetChild(0).GetComponent<Image>();
         lottery.Icon2 = lotteryItem.GetChild(1).GetChild(1).GetComponent<Image>();
         lottery.Lab = lotteryItem.GetChild(1).GetChild(2).GetComponent<Text>();
@@ -462,7 +467,7 @@ public class Lottery
         else if (lottery.Type == 3)
         {
             lottery.Icon1.SetActive(false);
-            
+
             lottery.Icon2.sprite = ManaGarden.FlowerInfoDic[lottery.Value].Icon;
 
             lottery.Icon2.Resize(true, 0.25f, 0.25f);
@@ -507,21 +512,30 @@ public class Lottery
         (
             () =>
             {
-                ManaAudio.PlayClip(Clip.BtnClip);
-
-                ManaReso.Get("Bc_Confirm").TweenForCG();
-
-                ManaReso.Get("Bc_LotteryItem1").TweenBacEuler();
-                ManaReso.Get("Bc_LotteryItem2").TweenBacEuler();
-                ManaReso.Get("Bc_LotteryItem3").TweenBacEuler();
-
+                ManaAudio.PlayClip(Clip.CurrentClip);
+                
                 ManaReso.Get<Button>("Bc_LotteryBack1").interactable = false;
                 ManaReso.Get<Button>("Bc_LotteryBack2").interactable = false;
                 ManaReso.Get<Button>("Bc_LotteryBack3").interactable = false;
-                
-                lottery.BK.SetActive(true);
 
+                lotteryItem.TweenBacEuler();
+
+                lottery.BK.SetActive(true);
+                
                 lottery.GetAward();
+
+                Auxiliary.Instance.DelayCall
+                (
+                    () =>
+                    {
+                        ManaReso.Get("Bc_Confirm").TweenForCG();
+
+                        ManaReso.Get("Bc_LotteryItem1").TweenBacEuler();
+                        ManaReso.Get("Bc_LotteryItem2").TweenBacEuler();
+                        ManaReso.Get("Bc_LotteryItem3").TweenBacEuler();
+                    },
+                    1f
+                );
             }
         );
     }
@@ -534,7 +548,7 @@ public class Lottery
         CreateLottery(ManaReso.Get("Bc_LotteryItem1"));
         CreateLottery(ManaReso.Get("Bc_LotteryItem2"));
         CreateLottery(ManaReso.Get("Bc_LotteryItem3"));
-
+        
         Button button1 = ManaReso.Get<Button>("Bc_LotteryBack1");
         Button button2 = ManaReso.Get<Button>("Bc_LotteryBack2");
         Button button3 = ManaReso.Get<Button>("Bc_LotteryBack3");
@@ -587,6 +601,8 @@ public class Lottery
             () =>
             {
                 ManaReso.Get("Bc_Lab").TweenForCG();
+
+                ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab"));
             },
             2.5f
         );
@@ -594,6 +610,8 @@ public class Lottery
 
     public static void EndLottery()
     {
+        ValueList = new List<int>();
+
         ManaReso.Get("Bc_Lab").TweenBacCG();
         ManaReso.Get("Bc_Confirm").TweenBacCG();
 
@@ -604,7 +622,7 @@ public class Lottery
         ManaReso.Get("Bb_SignIn").TweenBacCG();
         ManaReso.Get("Bc_Lottery").TweenBacCG();
 
-        ManaAudio.PlayClip(Clip.CurrentClip);
+        ManaAudio.PlayClip(Clip.BtnClip);
     }
 
 
@@ -618,23 +636,28 @@ public class Lottery
         if (Type == 1)
         {
             ManaCenter.Coin += Value;
+
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Coin") + Value);
         }
         else if (Type == 2)
         {
             ManaCenter.Diamond += Value;
+
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + Language.GetStr("Common", "Diamond") + Value);
         }
         else if (Type == 3)
         {
-            if (!ManaGarden.FlowerInfoDic[Value].Unlock)
-            {
-                ManaGarden.FlowerInfoDic[Value].Unlock = true;
-            }
+            ManaGarden.FlowerInfoDic[Value].Unlock = true;
+
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + ManaGarden.FlowerInfoDic[Value].Name);
         }
         else if (Type == 4)
         {
             ManaPlayer.CloseUnitDic[Value].Unlock();
 
             ManaPlayer.BoughtCloseList.UniqueAdd(Value);
+
+            ManaReso.SetText("Bc_Lab", Language.GetStr("UI", "Bc_Lab1") + ManaPlayer.CloseUnitDic[Value].ArmatureName);
         }
     }
 }

Assets/Script/Manage/ManaUI.cs

@@ -215,13 +215,24 @@ public class ManaUI : Regist
         ManaReso.Get("Bc_Lottery").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
         ManaReso.Get("Bc_Confirm").CreateTweenCG(0, 1, 0.25f, false, true, Curve.EaseOutQuad);
 
-
-        Vector3 pos = ManaReso.Get("Bc_LotteryItem2").position;
-
         ManaReso.Get("Bc_LotteryItem1").CreateTweenEuler(new Vector3(0, 180, 0), 0.25f, false, true, true, Curve.EaseOutQuad);
         ManaReso.Get("Bc_LotteryItem2").CreateTweenEuler(new Vector3(0, 180, 0), 0.25f, false, true, true, Curve.EaseOutQuad);
         ManaReso.Get("Bc_LotteryItem3").CreateTweenEuler(new Vector3(0, 180, 0), 0.25f, false, true, true, Curve.EaseOutQuad);
 
+        tween = ManaReso.Get("Bc_LotteryBK12").CreateTweenGra(new Color(242/255f, 255/255f, 142/255f, 180/255f), 1, true, true, Curve.EaseOutQuad);
+
+        tween.PingPong = true;
+        tween.StartForward();
+
+        tween = ManaReso.Get("Bc_LotteryBK22").CreateTweenGra(new Color(242 / 255f, 255 / 255f, 142 / 255f, 180 / 255f), 1, true, true, Curve.EaseOutQuad);
+
+        tween.PingPong = true;
+        tween.StartForward();
+
+        tween = ManaReso.Get("Bc_LotteryBK32").CreateTweenGra(new Color(242 / 255f, 255 / 255f, 142 / 255f, 180 / 255f), 1, true, true, Curve.EaseOutQuad);
+
+        tween.PingPong = true;
+        tween.StartForward();
 
         ManaReso.SetButtonEvent("Bc_Confirm", Lottery.EndLottery);
 

Assets/Script/Object/Flower.cs

@@ -585,16 +585,16 @@ public class Flower : Regist, IPointerClickHandler
 
     public void ShowAward()
     {
-        if (Slot.Index%9 == 3 || Slot.Index%9 == 8)
-        {
+        //if (Slot.Index%9 == 3 || Slot.Index%9 == 8)
+        //{
             GoldBk.SetX(ChildDic["GoldBKPosLeft"].position.x);
             GoldBk.GetComponent<SpriteRenderer>().flipX = true;
-        }
-        else
-        {
-            GoldBk.SetX(ChildDic["GoldBKPosRight"].position.x);
-            GoldBk.GetComponent<SpriteRenderer>().flipX = false;
-        }
+        //}
+        //else
+        //{
+        //    GoldBk.SetX(ChildDic["GoldBKPosRight"].position.x);
+        //    GoldBk.GetComponent<SpriteRenderer>().flipX = false;
+        //}
 
         GoldBk.SetY(transform.position.y + 2.5f);
         

Assets/Script/Object/Player.cs

@@ -165,54 +165,54 @@ public class CloseUnit
         }
 
         BuyBtn.onClick.AddListener
-            (
-                () =>
-                {
-                    ManaAudio.PlayClip(Clip.BtnClip);
+        (
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
 
-                    ManaReso.Get("Pa_Info").TweenForCG();
+                ManaReso.Get("Pa_Info").TweenForCG();
 
-                    Image image = ManaReso.Get<Image>("Pa_Icon2");
-                    image.sprite = Sprites[0];
-                    image.Resize(true, new Vector2(newSize, newSize));
+                Image image = ManaReso.Get<Image>("Pa_Icon2");
+                image.sprite = Sprites[0];
+                image.Resize(true, new Vector2(newSize, newSize));
 
-                    image.transform.localPosition = new Vector3(0, 22) + new Vector3(0, IconOffset);
+                image.transform.localPosition = new Vector3(0, 22) + new Vector3(0, IconOffset);
 
-                    if (Sprites.Length > 1)
-                    {
-                        ManaReso.SetActive("Pa_Icon1", true);
+                if (Sprites.Length > 1)
+                {
+                    ManaReso.SetActive("Pa_Icon1", true);
 
-                        Image image1 = ManaReso.Get<Image>("Pa_Icon1");
-                        image1.sprite = Sprites[1];
-                        image1.Resize(true, new Vector2(newSize, newSize));
+                    Image image1 = ManaReso.Get<Image>("Pa_Icon1");
+                    image1.sprite = Sprites[1];
+                    image1.Resize(true, new Vector2(newSize, newSize));
 
-                        image1.transform.localPosition = new Vector3(0, 22) + new Vector3(0, IconOffset) + (Vector3)IconOffset1 * newSize;
-                    }
-                    else
-                    {
-                        ManaReso.SetActive("Pa_Icon1", false);
-                    }
+                    image1.transform.localPosition = new Vector3(0, 22) + new Vector3(0, IconOffset) + (Vector3) IconOffset1*newSize;
+                }
+                else
+                {
+                    ManaReso.SetActive("Pa_Icon1", false);
+                }
 
-                    ManaReso.SetText("Pa_Lab", Description);
-                    ManaReso.SetText("Pa_BtnLab", Language.GetStr("UI", "Pa_BtnLab") + Auxiliary.ImageParse(BuyCurrent) + Auxiliary.ShrinkNumberStr(BuyAmt));
+                ManaReso.SetText("Pa_Lab", Description);
+                ManaReso.SetText("Pa_BtnLab", Language.GetStr("UI", "Pa_BtnLab") + Auxiliary.ImageParse(BuyCurrent) + BuyAmt);
 
-                    ManaReso.SetButtonEvent
-                        (
-                            "Pa_Btn",
-                            OnBuy
-                        );
-                }
-            );
+                ManaReso.SetButtonEvent
+                (
+                    "Pa_Btn",
+                    OnBuy
+                );
+            }
+        );
 
         DressBtn.onClick.AddListener
-            (
-                () =>
-                {
-                    ManaAudio.PlayClip(Clip.BtnClip);
+        (
+            () =>
+            {
+                ManaAudio.PlayClip(Clip.BtnClip);
 
-                    ManaPlayer.Player.ChangeClose(BodyPart, ArmatureName);
-                }
-            );
+                ManaPlayer.Player.ChangeClose(BodyPart, ArmatureName);
+            }
+        );
     }
 
     protected Sprite[] SpriteParse(string str)

Assets/Script/Tool/Auxiliary.cs

@@ -133,6 +133,11 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.N))
         {
+            //foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
+            //{
+            //    VARIABLE.Value.Unlock = true;
+            //}
+
             foreach (var VARIABLE in ManaGarden.FlowerInfoDic)
             {
                 VARIABLE.Value.Unlock = false;
@@ -151,15 +156,18 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.Z))
         {
-            ManaSign.SignIndex = 7;
-            ManaSign.SignTime = new DateTime(2017, 2, 3);
+            ManaGarden.AwardTimer = 0;
         }
 
         if (Input.GetKeyDown(KeyCode.X))
         {
-            ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
-            ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
-            ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
+            Lottery.ValueList = new List<int>();
+
+            Lottery.PlayAnimation();
+
+            //ManaReso.Get("Bc_LotteryItem1").TweenForEuler();
+            //ManaReso.Get("Bc_LotteryItem2").TweenForEuler();
+            //ManaReso.Get("Bc_LotteryItem3").TweenForEuler();
         }
 
         if (Input.GetKeyDown(KeyCode.C))

ToList.txt

@@ -1,3 +1,6 @@
+简单写下LotteryConfig
+
+
 还原PlayerConfig
 
 关闭调试界面