Skip to content

T
tuseGameColor
Commit 58b26377 authored by JiangWanZhi's avatar JiangWanZhi
Browse files
Options

修改组列表bug

parent e304eb29
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 61 deletions
Assets/Scenes/gameScene.unity
View file @ 58b26377
......@@ -4827,9 +4827,9 @@ MonoBehaviour:
m_HandleRect: {fileID: 5101221413184368358}
m_Direction: 0
m_MinValue: 0
m_MaxValue: 100
m_MaxValue: 1
m_WholeNumbers: 0
m_Value: 100
m_Value: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
......@@ -6885,7 +6885,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3396359898559686475}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 582a8965e0faeec4a8df7d0271769c6d, type: 3}
m_Name:
......
Assets/StreamingAssets/ccgCTqoiwmXnQ1RGBb.meta 0 → 100644
View file @ 58b26377
fileFormatVersion: 2
guid: 56fc7add0336b6e48b8241b81692c58a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/ccgCTqoiwmXnQ1RGBb/ccgCTqoiwmXnQ1RGBb_dynamic.bin.meta 0 → 100644
View file @ 58b26377
fileFormatVersion: 2
guid: dfb26de9a0b09a444918a5cbfb8f2888
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/ccgCTqoiwmXnQ1RGBb/ccgCTqoiwmXnQ1RGBb_jpg.jpg.meta 0 → 100644
View file @ 58b26377
fileFormatVersion: 2
guid: 71f4642317730074dba500116cd19586
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/ccgCTqoiwmXnQ1RGBb/ccgCTqoiwmXnQ1RGBb_json.bin.meta 0 → 100644
View file @ 58b26377
fileFormatVersion: 2
guid: 6cd1fd1f436fb2e41bc83f511ddab728
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/ccgCTqoiwmXnQ1RGBb/ccgCTqoiwmXnQ1RGBb_png.png.meta 0 → 100644
View file @ 58b26377
fileFormatVersion: 2
guid: 50902b95f88fd2a4daf8fbefb5299454
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/StreamingAssets/ccgCTqoiwmXnQ1RGBb/ccgCTqoiwmXnQ1RGBb_preview.png.meta 0 → 100644
View file @ 58b26377
fileFormatVersion: 2
guid: e35a230c85d8ea04d99169b912729d1a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/scripts/Panel/LoadingPanel.cs
View file @ 58b26377
......@@ -26,7 +26,6 @@ public class LoadingPanel : MonoBehaviour
private void ClosePanel(object[] values)
{
Debug.Log($"11111 رս");
if (gameObject.activeSelf)
{
JIndu.value = 1;
......@@ -43,7 +42,7 @@ public class LoadingPanel : MonoBehaviour
float jindu = 0;
private void ChangeSlider(object[] values)
{
jindu += 0.1f;//(float)values[0];
jindu = (float)values[0];
JIndu.value = jindu;
}
}
Assets/scripts/Views/maingame/GroupListManager.cs
View file @ 58b26377
......@@ -63,6 +63,11 @@ public class GroupListManager : MonoBehaviour
}
private void Event_ChoiseGroupByPic(object[] values) //图片区域长按选择一个组
{
if (clickflag)
{
clickflag = false;
return;
}
int Gid = (int)values[0];
var item = AllItem.FirstOrDefault((a) => a.GID == Gid);
......@@ -188,7 +193,6 @@ public class GroupListManager : MonoBehaviour
private void CreateGroup(object[] values)
{
Debug.Log($"11111 创建组");
AllAreaCount = 0;
ClickAreaCount = 0;
......@@ -294,8 +298,11 @@ public class GroupListManager : MonoBehaviour
private int nowidx = 0;
private int oldindex = 0;
private float ChildSize = 0;
private bool clickflag;
public void ClickItem(int Gid, int clickindex)
{
clickflag = true;
ChangeTipTitleState(false);
Vector3 clickpos = Vector3.zero;
foreach (var item in AllItem)
......
Assets/scripts/Views/maingame/Native.cs
View file @ 58b26377
......@@ -84,7 +84,7 @@ public class Native : MonoBehaviour
Debug.Log("JSON:" + json);
json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/cc--EDgRpc_nHQru7H.png\",\"hybridType\":64,\"id\":\"cc--EDgRpc_nHQru7H\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/cc--EDgRpc_nHQru7H.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
string name = "cc2D9Z2w9k0evqUiCQ";
string name = "ccgCTqoiwmXnQ1RGBb";
json = json.Replace("cc--EDgRpc_nHQru7H", name);
//json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/ccnKNH1bTLS-_Mg7A2.png\",\"hybridType\":64,\"id\":\"ccnKNH1bTLS-_Mg7A2\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/ccnKNH1bTLS-_Mg7A2.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
//#endif
......
Assets/scripts/common/mainGameView.cs
View file @ 58b26377
......@@ -1801,7 +1801,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
}
else
{
string path = Application.streamingAssetsPath + "/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_png.png";
string path = Application.streamingAssetsPath + $"/{key}/{key}_png.png";
WWW www = new WWW(path);
yield return www;
png = www.texture;
......@@ -1826,7 +1826,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
}
else
{
string path = Application.streamingAssetsPath + "/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_jpg.jpg";
string path = Application.streamingAssetsPath + $"/{key}/{key}_jpg.jpg";
WWW www = new WWW(path);
yield return www;
jpg_texture = www.texture;
......@@ -1836,7 +1836,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
ResJsonData jsondata = null;
if (!File.Exists(binlocalpath))
{
string path = Application.streamingAssetsPath + "/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_json.bin";
string path = Application.streamingAssetsPath + $"/{key}/{key}_json.bin";
WWW www = new WWW(path);
while (!www.isDone)
{
......@@ -1855,7 +1855,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
DynamicData dynamic = null;
if (!File.Exists(bindynamiclocalpath))
{
string path = Application.streamingAssetsPath + "/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_dynamic.bin";
string path = Application.streamingAssetsPath + $"/{key}/{key}_dynamic.bin";
WWW www = new WWW(path);
while (!www.isDone)
{
......@@ -1885,33 +1885,33 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
{
yield return null;
}
item.Init(key, png, jpg, jsondata, dynamic);
//加载本地的
loadpath = pngpath;
#if UNITY_ANDROID
loadpath = "file://" + pngpath;
#endif
var www_png = new WWW(pngpath);
yield return www_png;
if (www_png.isDone)
{
png = www_png.texture;
}
// loadpath = pngpath;
//#if UNITY_ANDROID
// loadpath = "file://" + pngpath;
//#endif
// var www_png = new WWW(pngpath);
// yield return www_png;
// if (www_png.isDone)
// {
// png = www_png.texture;
// }
loadpath = jpgpath;
#if UNITY_ANDROID
loadpath = "file://" + jpgpath;
#endif
var www_jpg = new WWW(jpgpath);
yield return www_jpg;
if (www_jpg.isDone)
{
jpg_texture = www_jpg.texture;
jpg = Sprite.Create(jpg_texture, new Rect(0, 0, jpg_texture.width, jpg_texture.height), new Vector2(0.5f, 0.5f));
}
jsondata = getdata(key);
item.Init(name, png, jpg, jsondata, dynamic);
// loadpath = jpgpath;
//#if UNITY_ANDROID
// loadpath = "file://" + jpgpath;
//#endif
// var www_jpg = new WWW(jpgpath);
// yield return www_jpg;
// if (www_jpg.isDone)
// {
// jpg_texture = www_jpg.texture;
// jpg = Sprite.Create(jpg_texture, new Rect(0, 0, jpg_texture.width, jpg_texture.height), new Vector2(0.5f, 0.5f));
// }
// jsondata = getdata(key);
// item.Init(name, png, jpg, jsondata, dynamic);
}
......
Assets/scripts/utils/SaveManager.cs
View file @ 58b26377
......@@ -45,32 +45,6 @@ public class SaveManager : MonoBehaviour
}
}
private void Update()
{
if (Input.GetKeyDown(KeyCode.A))
{
StartCoroutine(Test());
}
}
IEnumerator Test()
{
string path = Application.streamingAssetsPath + "/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.bin";
#if UNITY_ANDROID
path = "file://" + path;
#endif
WWW www = new WWW(path);
yield return www;
string str = www.text;
MemoryStream stream = new MemoryStream(www.bytes);
//二进制反序列化
BinaryFormatter bf = new BinaryFormatter();
ResJsonData test = (ResJsonData)bf.Deserialize(stream);
}
public void SaveRes(string key, DynamicData data, Texture2D png)
{
SavePng(key, png);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment