Commit 05562894 authored by shujianhe's avatar shujianhe

修改设置相关key

parent ecc43d61
...@@ -213,7 +213,7 @@ RectTransform: ...@@ -213,7 +213,7 @@ RectTransform:
- {fileID: 4930126960711289547} - {fileID: 4930126960711289547}
- {fileID: 2488998574890369715} - {fileID: 2488998574890369715}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: -1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -3515,7 +3515,7 @@ MonoBehaviour: ...@@ -3515,7 +3515,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 2545109457425451164} m_HandleRect: {fileID: 2545109457425451164}
m_Direction: 0 m_Direction: 0
m_Value: 1 m_Value: 1
m_Size: 1 m_Size: 0.9999999
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
m_PersistentCalls: m_PersistentCalls:
...@@ -3799,6 +3799,9 @@ MonoBehaviour: ...@@ -3799,6 +3799,9 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
perfabPath: perfabs/gameAreaGroupItem perfabPath: perfabs/gameAreaGroupItem
perfabPaths: [] perfabPaths: []
itemWidth: 110
itemHeight: 110
itemInterval: 5
--- !u!1 &8563517853556340769 --- !u!1 &8563517853556340769
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -331,7 +331,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -331,7 +331,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
Sprite sprite = Sprite.Create(texture2d, new Rect(0, 0, texture2d.width, texture2d.height), new Vector2(0.5f, 0.5f)); Sprite sprite = Sprite.Create(texture2d, new Rect(0, 0, texture2d.width, texture2d.height), new Vector2(0.5f, 0.5f));
image.sprite = sprite; image.sprite = sprite;
image.color = Color.white; image.color = Color.white;
autoSwitchGroup = Boolean.Parse(utilsTools.getGDataByKey<string>("auto-switch", autoSwitchGroup.ToString())); autoSwitchGroup = Boolean.Parse(utilsTools.getGDataByKey<string>("auto_switch", autoSwitchGroup.ToString()));
if (autoSwitchGroup == false) nowidx = -1; if (autoSwitchGroup == false) nowidx = -1;
vibration = Boolean.Parse(utilsTools.getGDataByKey<string>("vibration", vibration.ToString())); vibration = Boolean.Parse(utilsTools.getGDataByKey<string>("vibration", vibration.ToString()));
gameShowView.GetComponent<mainGameView>().loadGameImgId(); gameShowView.GetComponent<mainGameView>().loadGameImgId();
......
...@@ -707,6 +707,12 @@ public class mainGameView : MonoBehaviour ...@@ -707,6 +707,12 @@ public class mainGameView : MonoBehaviour
utilsTools.sendEventObjectParams("inGameLoadingValue", 3f, false); utilsTools.sendEventObjectParams("inGameLoadingValue", 3f, false);
fillAnimation = Boolean.Parse(utilsTools.getGDataByKey<String>("fillanimation", "false")); fillAnimation = Boolean.Parse(utilsTools.getGDataByKey<String>("fillanimation", "false"));
int selectId = int.Parse(utilsTools.getGDataByKey<String>("highlight_areas", "0"));
if(selectId < 0 || selectId>= allSelectTexturePaths.Count())
{
selectId = 0;
}
selectTextureIdx = selectId;
this.gameScenUseInfo = gameUserInfo; this.gameScenUseInfo = gameUserInfo;
for (short i = 0; i < gameUserInfo.areaInfoUseData.Count; i++) for (short i = 0; i < gameUserInfo.areaInfoUseData.Count; i++)
{ {
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using UnityEngine;
namespace Assets.scripts.utils namespace Assets.scripts.utils
{ {
public class VideoHelp public class VideoHelp
{ {
[DllImport("libavcodec", CallingConvention = CallingConvention.Cdecl)]
extern static uint avcodec_version();
public static bool Open(string path, int id, int width, int height, int fps)
{
return false;
}
public static bool PushColors(int id, Color[] colors)
{
return false;
}
public static bool Close(int id)
{
return false;
}
public static string getDllVersion()
{
return avcodec_version().ToString();
}
} }
} }
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