tron_wz/CaptainDiceDubloons_IOS_unity
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
changyunjia
2026-05-25 14:30:59 +08:00
parent 48aa54ee8d
commit 17902c05cf
35 changed files with 177 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ChillConnect/Helper/GameHelper.cs
+2 -1
View File
@@ -538,7 +538,7 @@ namespace ChillConnect
public static string getChString(decimal ch)
{
if (GameHelper.isRDExchangeMode())
if (GameHelper.isRDExchangeMode()&&GameHelper.IsGiftSwitch())
{
string str = "<img src='ui://o9974uc5qbo98'/>";
return str + $" {ch:N0}";
@@ -1649,6 +1649,7 @@ namespace ChillConnect
}
public static void ShowPaidPack()
{
if(!GameHelper.IsGiftSwitch()) return;
if (Random.Range(0, 100) < GetCommonModel().TurnOffPackRate)
{
Assets/ChillConnect/Manager/FXManager.cs
+1 -1
View File
@@ -190,7 +190,7 @@
fx_tips,
fx_wheel,
fx_win,
fx_win_title,
fx_winstar,
fx_proplight,
fx_addeffect,
fx_addeffect_1,
Assets/Resources/ChillConnectAssets/Atlas/Item/101.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Assets/Resources/ChillConnectAssets/Effect/spine/fx_win/congratulations_yanhua.json
+1 -1
View File
File diff suppressed because one or more lines are too long
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win/congratulations_yanhua.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 746 KiB

After

Width:  |  Height:  |  Size: 868 KiB

Assets/Resources/ChillConnectAssets/Effect/spine/fx_win/congratulations_yanhua.png.meta
+13
View File
@@ -106,6 +106,19 @@ TextureImporter:
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: []
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win/congratulations_yanhua_Material.mat
+1 -1
View File
@@ -37,7 +37,7 @@ Material:
- _OutlineSmoothness: 1
- _OutlineWidth: 3
- _StencilComp: 8
- _StencilRef: 0
- _StencilRef: 1
- _StraightAlphaInput: 1
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win/fx_win.prefab
+17 -18
View File
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7911276371097549189
--- !u!1 &6897971710986092023
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4175739190531402542}
- component: {fileID: 5244133773901813421}
- component: {fileID: 6664751217500399377}
- component: {fileID: 4355167145121591020}
- component: {fileID: 5805315626988157211}
- component: {fileID: 50643070829417790}
- component: {fileID: 1379734246271766626}
- component: {fileID: 4506010772668912806}
m_Layer: 0
m_Name: fx_win
m_TagString: Untagged
@@ -19,36 +19,36 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4175739190531402542
--- !u!4 &5805315626988157211
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7911276371097549189}
m_GameObject: {fileID: 6897971710986092023}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 2.44, y: 10, z: -0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5244133773901813421
--- !u!33 &50643070829417790
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7911276371097549189}
m_GameObject: {fileID: 6897971710986092023}
m_Mesh: {fileID: 0}
--- !u!23 &6664751217500399377
--- !u!23 &1379734246271766626
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7911276371097549189}
m_GameObject: {fileID: 6897971710986092023}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -62,8 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 5c4cb03cc72e947e4b8deb2c89c4cbb9, type: 2}
- {fileID: 2100000, guid: 4b006093eea254857818cdaf799fccc2, type: 2}
- {fileID: 2100000, guid: fdd9556db9e9541c59b5273d847a59e1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -85,13 +84,13 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &4355167145121591020
--- !u!114 &4506010772668912806
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7911276371097549189}
m_GameObject: {fileID: 6897971710986092023}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
@@ -119,6 +118,6 @@ MonoBehaviour:
materialsInsideMask: []
materialsOutsideMask: []
disableRenderingOnOverride: 1
_animationName: out
loop: 0
_animationName:
loop: 1
timeScale: 1
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win/fx_win.prefab.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b59862922e1024de2994d270a231a410
guid: 03910770218516744a9ae3dde499177e
PrefabImporter:
externalObjects: {}
userData:
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title.atlas.txt
-48
View File
@@ -1,48 +0,0 @@
title.png
size: 1736,250
format: RGBA8888
filter: Linear,Linear
repeat: none
congratulation_bg
rotate: false
xy: 2, 2
size: 1080, 246
orig: 1080, 249
offset: 0, 1
index: -1
congratulation_star1
rotate: false
xy: 1084, 62
size: 33, 32
orig: 33, 32
offset: 0, 0
index: -1
congratulation_star2
rotate: false
xy: 1084, 34
size: 25, 26
orig: 25, 26
offset: 0, 0
index: -1
congratulation_star3
rotate: false
xy: 1119, 70
size: 25, 24
orig: 25, 26
offset: 0, 1
index: -1
congratulation_star4
rotate: false
xy: 1084, 10
size: 21, 22
orig: 21, 22
offset: 0, 0
index: -1
congratulation_title
rotate: false
xy: 1084, 96
size: 650, 152
orig: 650, 152
offset: 0, 0
index: -1
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title.json
-1
View File
@@ -1 +0,0 @@
{"skeleton":{"hash":"3WbTX2Edadb6j+F38okAR0iQ5QI","spine":"3.8.93","x":-540,"y":-124,"width":1080,"height":249},"bones":[{"name":"root"},{"name":"congratulation_star1","parent":"root","x":-288.65,"y":94.21},{"name":"congratulation_title","parent":"root"},{"name":"congratulation_star4","parent":"root","x":407.1,"y":-53.82},{"name":"congratulation_star3","parent":"root","x":243.39,"y":-82.82},{"name":"congratulation_star2","parent":"root","x":113.91,"y":111.63},{"name":"congratulation_bg","parent":"root"}],"slots":[{"name":"congratulation_bg","bone":"congratulation_bg","attachment":"congratulation_bg"},{"name":"congratulation_title","bone":"congratulation_title","attachment":"congratulation_title"},{"name":"congratulation_star1","bone":"congratulation_star1","attachment":"congratulation_star1"},{"name":"congratulation_star2","bone":"congratulation_star2","attachment":"congratulation_star2"},{"name":"congratulation_star3","bone":"congratulation_star3","attachment":"congratulation_star3"},{"name":"congratulation_star4","bone":"congratulation_star4","attachment":"congratulation_star4"}],"skins":[{"name":"default","attachments":{"congratulation_bg":{"congratulation_bg":{"y":0.5,"width":1080,"height":249}},"congratulation_star1":{"congratulation_star1":{"x":0.5,"width":33,"height":32}},"congratulation_star2":{"congratulation_star2":{"x":0.5,"width":25,"height":26}},"congratulation_star3":{"congratulation_star3":{"x":0.13,"y":-0.37,"width":25,"height":26}},"congratulation_star4":{"congratulation_star4":{"x":-0.38,"y":0.22,"width":21,"height":22}},"congratulation_title":{"congratulation_title":{"width":650,"height":152}}}}],"animations":{"animation":{"slots":{"congratulation_bg":{"color":[{"color":"ffffff56"},{"time":0.2667,"color":"ffffffff"}]},"congratulation_star1":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.5333,"color":"ffffff00"},{"time":0.7667,"color":"ffffffff"},{"time":1,"color":"ffffff00"}]},"congratulation_star2":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.4333,"color":"ffffff00"},{"time":0.6667,"color":"ffffffff"},{"time":0.9,"color":"ffffff00"}]},"congratulation_star3":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.4,"color":"ffffff00"},{"time":0.6333,"color":"ffffffff"},{"time":0.8667,"color":"ffffff00"}]},"congratulation_star4":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.5667,"color":"ffffff00"},{"time":0.8,"color":"ffffffff"},{"time":1.0333,"color":"ffffff00"}]},"congratulation_title":{"color":[{"color":"ffffff00","curve":"stepped"},{"time":0.1,"color":"ffffff00"},{"time":0.4333,"color":"ffffffff"}]}},"bones":{"congratulation_star1":{"rotate":[{"time":0.5333,"angle":-58.16},{"time":1}],"translate":[{"time":0.5333,"x":139.7,"y":-91.44},{"time":1}],"scale":[{"time":0.5333,"x":0.761,"y":0.761},{"time":1}]},"congratulation_star2":{"rotate":[{"time":0.4333,"angle":-66.05},{"time":0.9}],"translate":[{"time":0.4333,"x":86.99,"y":-69.85},{"time":0.9}],"scale":[{"time":0.4333,"x":0.789,"y":0.789}]},"congratulation_bg":{"scale":[{"x":1.004,"y":0.674},{"time":0.2667}]},"congratulation_title":{"scale":[{"x":0.752,"y":0.752,"curve":"stepped"},{"time":0.1,"x":0.752,"y":0.752},{"time":0.4333},{"time":0.5,"x":1.054,"y":1.054},{"time":0.5667}]},"congratulation_star3":{"rotate":[{"angle":112.75},{"time":0.4,"angle":172.95},{"time":0.8667,"angle":112.75}],"translate":[{"x":-91.87,"y":43.75},{"time":0.4,"x":-105.87,"y":79.2},{"time":0.8667}],"scale":[{"x":0.791,"y":0.791,"curve":"stepped"},{"time":0.4,"x":0.791,"y":0.791},{"time":0.8667}]},"congratulation_star4":{"rotate":[{"time":0.5667,"angle":71.32},{"time":1.0333}],"translate":[{"time":0.5667,"x":-163.83,"y":51.43},{"time":1.0333}],"scale":[{"time":0.5667,"x":0.817,"y":0.817},{"time":1.0333}]}}}}}
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 81 KiB

Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4b4f8deb79e58ec45b3a233ba92eb0fb
guid: 6aa38900904014e41bd215c820399c41
folderAsset: yes
DefaultImporter:
externalObjects: {}
Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star.atlas.txt
+62
View File
@@ -0,0 +1,62 @@
congratulations_star.png
size: 474,191
format: RGBA8888
filter: Linear,Linear
repeat: none
star
rotate: true
xy: 331, 43
size: 146, 141
orig: 146, 141
offset: 0, 0
index: -1
star_00
rotate: false
xy: 2, 18
size: 178, 171
orig: 178, 171
offset: 0, 0
index: -1
star_01
rotate: true
xy: 322, 15
size: 26, 28
orig: 26, 28
offset: 0, 0
index: -1
star_01_big
rotate: false
xy: 182, 47
size: 147, 142
orig: 147, 142
offset: 0, 0
index: -1
star_02
rotate: true
xy: 182, 2
size: 43, 44
orig: 43, 45
offset: 0, 1
index: -1
star_03
rotate: true
xy: 292, 15
size: 30, 28
orig: 30, 29
offset: 0, 1
index: -1
star_04
rotate: false
xy: 228, 12
size: 31, 33
orig: 31, 34
offset: 0, 1
index: -1
star_05
rotate: false
xy: 261, 13
size: 29, 32
orig: 30, 32
offset: 1, 0
index: -1
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title.atlas.txt.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star.atlas.txt.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 67f0275860cd34bddba21744f9c149d4
guid: 00054c1cf02a1e14c8a65edf62c1daa3
TextScriptImporter:
externalObjects: {}
userData:
Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star.json
+1
View File
File diff suppressed because one or more lines are too long
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title.json.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star.json.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d7a83a1c6f05a406ea4702126937a165
guid: cc5f0c11b01d0cd42b10b8f835528c9d
TextScriptImporter:
externalObjects: {}
userData:
Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 73 KiB

Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title.png.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star.png.meta
+14 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c3f96a337bf2e4232bac20925bbc305f
guid: 6c455070f01c8b5448d8c93a49f4f43a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
@@ -106,6 +106,19 @@ TextureImporter:
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: []
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title_Atlas.asset → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star_Atlas.asset
+3 -3
View File
@@ -10,8 +10,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: title_Atlas
m_Name: congratulations_star_Atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: 67f0275860cd34bddba21744f9c149d4, type: 3}
atlasFile: {fileID: 4900000, guid: 00054c1cf02a1e14c8a65edf62c1daa3, type: 3}
materials:
- {fileID: 2100000, guid: d690235cc2165456ca516d488a773c69, type: 2}
- {fileID: 2100000, guid: 153abcb8e368fe848acc10e276e5ae2f, type: 2}
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title_Atlas.asset.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star_Atlas.asset.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d0150a67a96324e588b10845028c38b7
guid: ddfa54bb1a3d5cf488a25506f9deadab
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title_Material.mat → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star_Material.mat
+5 -6
View File
@@ -7,12 +7,11 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: title_Material
m_Name: congratulations_star_Material
m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_ValidKeywords: []
m_InvalidKeywords:
- _USE8NEIGHBOURHOOD_ON
m_LightmapFlags: 4
@@ -26,7 +25,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: c3f96a337bf2e4232bac20925bbc305f, type: 3}
m_Texture: {fileID: 2800000, guid: 6c455070f01c8b5448d8c93a49f4f43a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
@@ -37,8 +36,8 @@ Material:
- _OutlineSmoothness: 1
- _OutlineWidth: 3
- _StencilComp: 8
- _StencilRef: 0
- _StraightAlphaInput: 1
- _StencilRef: 1
- _StraightAlphaInput: 0
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
m_Colors:
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title_Material.mat.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star_Material.mat.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d690235cc2165456ca516d488a773c69
guid: 153abcb8e368fe848acc10e276e5ae2f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title_SkeletonData.asset → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star_SkeletonData.asset
+3 -3
View File
@@ -10,12 +10,12 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: title_SkeletonData
m_Name: congratulations_star_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: d0150a67a96324e588b10845028c38b7, type: 2}
- {fileID: 11400000, guid: ddfa54bb1a3d5cf488a25506f9deadab, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: d7a83a1c6f05a406ea4702126937a165, type: 3}
skeletonJSON: {fileID: 4900000, guid: cc5f0c11b01d0cd42b10b8f835528c9d, type: 3}
isUpgradingBlendModeMaterials: 0
blendModeMaterials:
requiresBlendModeMaterials: 0
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/title_SkeletonData.asset.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/congratulations_star_SkeletonData.asset.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ffb17e9c8ca944799b75d0a64c61a838
guid: c904904d9ef982e4aaebc12c66434c29
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/fx_win_title.prefab → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/fx_winstar.prefab
+17 -17
View File
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6370662756761607514
--- !u!1 &2851238551778538667
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,47 +8,47 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 561512823629169263}
- component: {fileID: 3775735963607805121}
- component: {fileID: 8952928207636871191}
- component: {fileID: 3420851697556392948}
- component: {fileID: 7051869499874706476}
- component: {fileID: 3807915272122702111}
- component: {fileID: 4778784357384129423}
- component: {fileID: 2867325355837349055}
m_Layer: 0
m_Name: fx_win_title
m_Name: fx_winstar
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &561512823629169263
--- !u!4 &7051869499874706476
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6370662756761607514}
m_GameObject: {fileID: 2851238551778538667}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 1.98, y: 9.9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3775735963607805121
--- !u!33 &3807915272122702111
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6370662756761607514}
m_GameObject: {fileID: 2851238551778538667}
m_Mesh: {fileID: 0}
--- !u!23 &8952928207636871191
--- !u!23 &4778784357384129423
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6370662756761607514}
m_GameObject: {fileID: 2851238551778538667}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 41fdf87037ad84d03a0e22f804bc06c2, type: 2}
- {fileID: 2100000, guid: 153abcb8e368fe848acc10e276e5ae2f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -84,19 +84,19 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &3420851697556392948
--- !u!114 &2867325355837349055
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6370662756761607514}
m_GameObject: {fileID: 2851238551778538667}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
m_Name:
m_EditorClassIdentifier:
skeletonDataAsset: {fileID: 11400000, guid: ffb17e9c8ca944799b75d0a64c61a838, type: 2}
skeletonDataAsset: {fileID: 11400000, guid: c904904d9ef982e4aaebc12c66434c29, type: 2}
initialSkinName:
initialFlipX: 0
initialFlipY: 0
Assets/Resources/ChillConnectAssets/Effect/spine/fx_win_title/fx_win_title.prefab.meta → Assets/Resources/ChillConnectAssets/Effect/spine/fx_winstar/fx_winstar.prefab.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2d3df6670de0bb24ebadffa2ed4b95b1
guid: 423bac0f2dd66a340a2ac6daa3dce2d3
PrefabImporter:
externalObjects: {}
userData:
Assets/Scripts/GetTaskReward/GetTaskRewardUI.cs
+5 -5
View File
@@ -65,7 +65,7 @@ namespace ChillConnect
// Debug.Log(args);
int number = data.rewards;
ui.text_award.text = number.ToString();
ui.btn_claim.title = "Claim(<img src='ui://o9974uc5lryfcj'/>" + number + ")";
ui.btn_claim.title = "Claim(<img src='ui://o9974uc5cou6b8'/>" + number + ")";
ui.btn_claim.SetClick(() =>
{
GameHelper.addInterAdnumber();
@@ -142,9 +142,9 @@ namespace ChillConnect
((wheel_)ui.wheel.GetChild("wheel_")).t1.Play(() =>
{
rate_idnex++;
ui.btn_mult.title = "(<img src='ui://o9974uc5lryfck'/>" + +rewardNum * boostList[rate_idnex % 5]+ ")";
ui.btn_mult.title = "(<img src='ui://o9974uc5cou6b8'/>" + +rewardNum * boostList[rate_idnex % 5]+ ")";
});
ui.btn_mult.title = "(<img src='ui://o9974uc5lryfck'/>" + +rewardNum * boostList[rate_idnex]+ ")";
ui.btn_mult.title = "(<img src='ui://o9974uc5cou6b8'/>" + +rewardNum * boostList[rate_idnex]+ ")";
list_1 = new List<item_wheel>() { ((wheel_)ui.wheel.GetChild("wheel_")).item_0, ((wheel_)ui.wheel.GetChild("wheel_")).item_1, (ui.wheel.GetChild("wheel_") as wheel_).item_2, (ui.wheel.GetChild("wheel_") as wheel_).item_3, (ui.wheel.GetChild("wheel_") as wheel_).item_4, (ui.wheel.GetChild("wheel_") as wheel_).item_5, (ui.wheel.GetChild("wheel_") as wheel_).item_6, (ui.wheel.GetChild("wheel_") as wheel_).item_7, };
// list_1[2].img_light.visible = true;
@@ -188,7 +188,7 @@ namespace ChillConnect
((wheel_)ui.wheel.GetChild("wheel_")).t1.Play(() =>
{
rate_idnex++;
ui.btn_mult.title = "(<img src='ui://o9974uc5lryfck'/>" + GameHelper.Get101Str((decimal)rewardNum * boostList[rate_idnex % boostList.Length])+ ")";
ui.btn_mult.title = "(<img src='ui://o9974uc5cou6b8'/>" + GameHelper.Get101Str((decimal)rewardNum * boostList[rate_idnex % boostList.Length])+ ")";
});
((wheel_)ui.wheel.GetChild("wheel_")).t0.Play(Scroll);
@@ -233,7 +233,7 @@ namespace ChillConnect
((wheel_)ui.wheel.GetChild("wheel_")).t1.Play(() =>
{
rate_idnex++;
ui.btn_mult.title = "(<img src='ui://o9974uc5lryfck'/>" + GameHelper.Get101Str((decimal)rewardNum * boostList[rate_idnex % boostList.Length]) + ")";
ui.btn_mult.title = "(<img src='ui://o9974uc5cou6b8'/>" + GameHelper.Get101Str((decimal)rewardNum * boostList[rate_idnex % boostList.Length]) + ")";
});
((wheel_)ui.wheel.GetChild("wheel_")).t0.Play(Scroll);
Assets/Scripts/MainScene.cs
+1 -1
View File
@@ -79,7 +79,7 @@ namespace ChillConnect
AppDispatcher.Instance.AddListener(AppMsg.LoginInit, OnLoadingComplete);
// DataMgr.InitPreferences();
// NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig);
NetworkDispatcher.Instance.Dispatch(NetworkMsg.GetConfig);
}
private bool ispen = false;
private void OnLoadingComplete(object param = null)
Assets/Scripts/ModuleUI/GameResult/GameResultUI.cs
+13 -12
View File
@@ -112,8 +112,9 @@ namespace ChillConnect
{
AwardNum = 20;
AwardRate = 2;
ui.btn_claim.title = "Claim(" + AwardNum + ")";
}
ui.btn_claim.title = "Claim(" + GameHelper.getChString((decimal)AwardNum) + ")";
else ui.btn_claim.title = "Claim(" + GameHelper.getChString((decimal)AwardNum) + ")";
if (IsWin)
{
if (PlayerPrefs.GetFloat("soundVolume", 1.0f) > 0f)
@@ -162,7 +163,7 @@ namespace ChillConnect
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.bg_parent, Fx_Type.fx_win, ref closeCallback);
sk.state.SetAnimation(0, "out", true);
var sk1 = FXManager.Instance.SetFx<SkeletonAnimation>(ui.bg_parent_title, Fx_Type.fx_win_title, ref closeCallback);
var sk1 = FXManager.Instance.SetFx<SkeletonAnimation>(ui.bg_parent_title, Fx_Type.fx_winstar, ref closeCallback);
sk1.state.SetAnimation(0, "animation", false);
}
@@ -626,11 +627,11 @@ namespace ChillConnect
list_1[i].text_rate.text = "X" + rate_list[i];
}
(ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
{
rate_idnex++;
ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.cash_number * successData_.boost_array[rate_idnex % successData_.boost_array.Length]) + ")";
});
(ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
{
rate_idnex++;
ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.cash_number * successData_.boost_array[rate_idnex % successData_.boost_array.Length]) + ")";
});
(ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
@@ -674,11 +675,11 @@ namespace ChillConnect
// return;
// }
(ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
{
rate_idnex++;
ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.cash_number * successData_.boost_array[rate_idnex % successData_.boost_array.Length]) + ")";
});
(ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
{
rate_idnex++;
ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.cash_number * successData_.boost_array[rate_idnex % successData_.boost_array.Length]) + ")";
});
(ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
(ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale = (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale - 0.3f;
Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs
+1 -1
View File
@@ -99,7 +99,7 @@ namespace ChillConnect
// ui.bg.visible = false;
// });
ui.t0.Play();
DOVirtual.DelayedCall(3.5f, () =>
DOVirtual.DelayedCall(1.5f, () =>
{
// ui.anim.visible = false;
if (need_show&&GameHelper.IsGiftSwitch()) {
Assets/Scripts/ModuleUI/PassView/PassViewUI.cs
+1 -1
View File
@@ -59,7 +59,7 @@ namespace ChillConnect
{
if (Screen.safeArea.y != 0)
{
ui.bg.y += 68;
// ui.bg.y += 68;
ui.group_top.y += 68;
}
Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs
+1 -1
View File
@@ -107,7 +107,7 @@ namespace ChillConnect
ui.btn_privacy.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 0); });
ui.btn_terms.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 1); });
ui.btn_official.SetClick(() => { OpenBrowser.OpenURL("https://www.ballcrushbest.fun"); });
ui.btn_official.SetClick(() => { OpenBrowser.OpenURL("https://reddhotcompangost.com"); });
ui.btn_us.SetClick(() => { GameHelper.OpenEmail(); });
Assets/Scripts/ModuleUI/Play/RainPlayUI.cs
+2 -2
View File
@@ -1731,7 +1731,7 @@ namespace ChillConnect
return;
}
if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence)
if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence&&GameHelper.IsGiftSwitch())
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
@@ -1775,7 +1775,7 @@ namespace ChillConnect
is_showslot = true;
return;
}
if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence)
if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence&&GameHelper.IsGiftSwitch())
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
Assets/Scripts/ModuleUI/Reward/RewardUI.cs
+5 -5
View File
@@ -94,7 +94,7 @@ namespace ChillConnect
var value = GetRewardValue();
ui.text_num.text = GameHelper.Get101Str(value);
ui.btn_collect.title = "Claim(<img src='ui://o9974uc5lryfcj'/>" + GameHelper.Get101Str((decimal)value) + ")";
ui.btn_collect.title = "Claim(<img src='ui://o9974uc5cou6b8'/>" + GameHelper.Get101Str((decimal)value) + ")";
DOVirtual.DelayedCall(0.2f, () =>
{
var gamwin =
@@ -157,9 +157,9 @@ namespace ChillConnect
(ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
{
rate_idnex++;
ui.btn_multi.title = "(<img src='ui://o9974uc5lryfck'/>"+ cash_num * boost_array[rate_idnex % 5] + ")";
ui.btn_multi.title = "(<img src='ui://o9974uc5cou6b8'/>"+ cash_num * boost_array[rate_idnex % 5] + ")";
});
ui.btn_multi.title = "(<img src='ui://o9974uc5lryfck'/>" + cash_num * boost_array[4] + ")";
ui.btn_multi.title = "(<img src='ui://o9974uc5cou6b8'/>" + cash_num * boost_array[4] + ")";
list_1 = new List<item_wheel>() { (ui.wheel.GetChild("wheel_") as wheel_).item_0, (ui.wheel.GetChild("wheel_") as wheel_).item_1, (ui.wheel.GetChild("wheel_") as wheel_).item_2, (ui.wheel.GetChild("wheel_") as wheel_).item_3, (ui.wheel.GetChild("wheel_") as wheel_).item_4, (ui.wheel.GetChild("wheel_") as wheel_).item_5, (ui.wheel.GetChild("wheel_") as wheel_).item_6, (ui.wheel.GetChild("wheel_") as wheel_).item_7, };
// list_1[2].img_light.visible = true;
@@ -286,7 +286,7 @@ namespace ChillConnect
(ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
{
rate_idnex++;
ui.btn_multi.title ="(<img src='ui://o9974uc5lryfck'/>" + GameHelper.Get101Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]) + ")";
ui.btn_multi.title ="(<img src='ui://o9974uc5cou6b8'/>" + GameHelper.Get101Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]) + ")";
});
(ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
@@ -341,7 +341,7 @@ namespace ChillConnect
(ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() =>
{
rate_idnex++;
ui.btn_multi.title = "(<img src='ui://o9974uc5lryfck'/>" + GameHelper.Get101Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]) + ")";
ui.btn_multi.title = "(<img src='ui://o9974uc5cou6b8'/>" + GameHelper.Get101Str((decimal)cash_num * boost_array[rate_idnex % boost_array.Length]) + ")";
});
(ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);