PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【优化】更新广告奖励本地化、删除无用字体

iOS_release
zhangaotian 2024-06-24 18:41:42 +08:00
parent be4b95f88a
commit 8e8d36b2cf
17 changed files with 1102 additions and 1285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2087
Forest/Assets/Art/Font/Canger SDF.asset
View File

File diff suppressed because one or more lines are too long

207
Forest/Assets/Art/Font/Number_font.fontsettings
View File

@ -1,207 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!128 &12800000
Font:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Number_font
serializedVersion: 5
m_LineSpacing: 0.1
m_DefaultMaterial: {fileID: 2100000, guid: d1c44fda2af4ef04d87dcb679c7822bd, type: 2}
m_FontSize: 0
m_Texture: {fileID: 0}
m_AsciiStartOffset: 0
m_Tracking: 1
m_CharacterSpacing: 0
m_CharacterPadding: 1
m_ConvertCase: 0
m_CharacterRects:
- serializedVersion: 2
index: 58
uv:
serializedVersion: 2
x: 0
y: 0.16842106
width: 0.06329114
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 80
height: -160
advance: 80
flipped: 0
- serializedVersion: 2
index: 48
uv:
serializedVersion: 2
x: 0.07753164
y: 0.16842106
width: 0.07911392
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 49
uv:
serializedVersion: 2
x: 0.15664557
y: 0.17192982
width: 0.07911393
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 50
uv:
serializedVersion: 2
x: 0.24287975
y: 0.16842106
width: 0.07911393
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 51
uv:
serializedVersion: 2
x: 0.346519
y: 0.16842106
width: 0.07911393
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 52
uv:
serializedVersion: 2
x: 0.44066456
y: 0.16842106
width: 0.07911393
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 53
uv:
serializedVersion: 2
x: 0.53322786
y: 0.16842106
width: 0.0791139
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 54
uv:
serializedVersion: 2
x: 0.6281645
y: 0.16491228
width: 0.07911396
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 55
uv:
serializedVersion: 2
x: 0.7199367
y: 0.16842106
width: 0.0791139
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 56
uv:
serializedVersion: 2
x: 0.8212025
y: 0.16842106
width: 0.07911396
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
- serializedVersion: 2
index: 57
uv:
serializedVersion: 2
x: 0.91297466
y: 0.16491228
width: 0.07911396
height: 0.5614035
vert:
serializedVersion: 2
x: 0
y: 80
width: 100
height: -160
advance: 100
flipped: 0
m_KerningValues: []
m_PixelScale: 0.1
m_FontData:
m_Ascent: 0
m_Descent: 0
m_DefaultStyle: 0
m_FontNames: []
m_FallbackFonts: []
m_FontRenderingMode: 0
m_UseLegacyBoundsCalculation: 0
m_ShouldRoundAdvanceValue: 1

6
Forest/Assets/Art/UI/Prefab/UIADPopup.prefab
View File

@ -651,10 +651,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 3248684824553324146} m_Father: {fileID: 3248684824553324146}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 476.41284} m_AnchoredPosition: {x: 0, y: 476.41284}
m_SizeDelta: {x: 369.2, y: 140.6256} m_SizeDelta: {x: -468.8, y: -1305.0292}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5422889587196845987 --- !u!222 &5422889587196845987
CanvasRenderer: CanvasRenderer:

4
Forest/Assets/Art/UI/Prefab/UILoading.prefab
View File

@ -657,9 +657,9 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3558846005941668724}
- {fileID: 6284310749672224075}
- {fileID: 7156708611748780970} - {fileID: 7156708611748780970}
- {fileID: 6284310749672224075}
- {fileID: 3558846005941668724}
m_Father: {fileID: 0} m_Father: {fileID: 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}

4
Forest/Assets/Config/Data/stringcfg_stringconfig.json
View File

@ -236,8 +236,8 @@
{ {
"ID": 140, "ID": 140,
"Key": "AD_Title", "Key": "AD_Title",
"Value": "奖励", "Value": "失败激励",
"Value_En": "REWARD" "Value_En": "Reward Failed"
}, },
{ {
"ID": 141, "ID": 141,

6
Forest/Assets/Art/Font/Number_font.fontsettings.meta → Forest/Assets/Editor/Art.meta
View File

@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a5718c23729f64f42a69c9b4dcc0e84e guid: d2daf1eff4891469eb378cb52d67ca83
NativeFormatImporter: folderAsset: yes
DefaultImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 12800000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

8
Forest/Assets/Editor/Art/Font.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 752d9f00b4043418b9574dba16f78d42
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Forest/Assets/Art/Font/Canger.ttf → Forest/Assets/Editor/Art/Font/Canger.ttf
View File

0
Forest/Assets/Art/Font/Canger.ttf.meta → Forest/Assets/Editor/Art/Font/Canger.ttf.meta
View File

1
Forest/Assets/Art/Font/FontConfig.json → Forest/Assets/Editor/Art/Font/FontConfig.json
View File

@ -60,3 +60,4 @@ QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm
当前无网络连接 当前无网络连接
当前已与账号同步至最新是否确定退出账号 当前已与账号同步至最新是否确定退出账号
简体中文 简体中文
失败激励

0
Forest/Assets/Art/Font/FontConfig.json.meta → Forest/Assets/Editor/Art/Font/FontConfig.json.meta
View File

2
Forest/Assets/Scripts/Framework/Constants/Constants.UI.cs
View File

@ -11,7 +11,7 @@ namespace Framework.Constants
public static readonly string UILevelPanel = "UILevelPanel"; public static readonly string UILevelPanel = "UILevelPanel";
public static readonly string UIScore = "UIScore"; public static readonly string UIScore = "UIScore";
public static readonly string UILoading = "UILoading"; public static readonly string UILoading = "UILoading";
public static readonly string UIADPOPUP = "UIADPopup"; public static readonly string UIAdPopUp = "UIADPopup";
public static readonly string UISyncTip = "UISyncTip"; public static readonly string UISyncTip = "UISyncTip";
public static readonly string UIWinPanel = "UIWinPanel"; public static readonly string UIWinPanel = "UIWinPanel";
public static readonly string UIBuyGoods = "UIBuyGoods"; public static readonly string UIBuyGoods = "UIBuyGoods";

2
Forest/Assets/Scripts/Framework/UI/UIManager.cs
View File

@ -286,7 +286,7 @@ namespace Framework.UI
_WindowMeta(UIConstants.UIUserAgreement, UIWindowLayer.PopupTips); _WindowMeta(UIConstants.UIUserAgreement, UIWindowLayer.PopupTips);
_WindowMeta(UIConstants.UIShop, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIShop, UIWindowLayer.Normal);
_WindowMeta(UIConstants.UIADPOPUP, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIAdPopUp, UIWindowLayer.Normal);
_WindowMeta(UIConstants.UIBuyGoods, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIBuyGoods, UIWindowLayer.Normal);
_WindowMeta(UIConstants.UIWinPanel, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIWinPanel, UIWindowLayer.Normal);
_WindowMeta(UIConstants.UIMainPanel, UIWindowLayer.Normal); _WindowMeta(UIConstants.UIMainPanel, UIWindowLayer.Normal);

2
Forest/Assets/Scripts/Gameplay/Manager/LevelManager.cs
View File

@ -321,7 +321,7 @@ namespace Gameplay.Manager
if (_levelLoseTime >= 2 && ADManager.Instance.CanShow(103)) if (_levelLoseTime >= 2 && ADManager.Instance.CanShow(103))
{ {
AudioManager.Instance.PlaySound(AudioType.SOUND, "S_Reward", new UnityAudio(false)); AudioManager.Instance.PlaySound(AudioType.SOUND, "S_Reward", new UnityAudio(false));
UIManager.Instance.OpenWindow(UIConstants.UIADPOPUP); UIManager.Instance.OpenWindow(UIConstants.UIAdPopUp);
} }
else else
{ {

26
Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs
View File

@ -12,7 +12,7 @@ namespace Gameplay.Manager
{ {
public class ShopManager : Singlenton<ShopManager>, IInitable public class ShopManager : Singlenton<ShopManager>, IInitable
{ {
public Dictionary<PropType, int> UnusedPropCount; private Dictionary<PropType, int> _unusedPropCount;
public string Platform = "ios"; public string Platform = "ios";
public bool IsDebug; public bool IsDebug;
@ -34,7 +34,7 @@ namespace Gameplay.Manager
{ {
if (_init) return; if (_init) return;
UnusedPropCount = new Dictionary<PropType, int>() _unusedPropCount = new Dictionary<PropType, int>()
{ { PropType.Undo, 0 }, { PropType.OpenHole, 0 }, { PropType.AddTime, 0 } }; { { PropType.Undo, 0 }, { PropType.OpenHole, 0 }, { PropType.AddTime, 0 } };
InitProducts(); InitProducts();
@ -51,8 +51,8 @@ namespace Gameplay.Manager
#endif #endif
_consumableGoods = new Dictionary<string, int>() _consumableGoods = new Dictionary<string, int>()
{ {
{ Platform + "_pack_coins_100", 100 }, { Platform + "_pack_coins_600", 600 }, { Platform + "_CoinBox_100", 100 }, { Platform + "_CoinBox_600", 600 },
{ Platform + "_pack_coins_1200", 1600 } { Platform + "_CoinBox_1200", 1600 }
}; };
_nonConsumableGoods = new Dictionary<string, int>(); _nonConsumableGoods = new Dictionary<string, int>();
} }
@ -121,21 +121,21 @@ namespace Gameplay.Manager
{ {
CurCoin -= LevelConstants.PropPrice; CurCoin -= LevelConstants.PropPrice;
tempLevelData.undoCount++; tempLevelData.undoCount++;
UnusedPropCount[PropType.Undo]++; _unusedPropCount[PropType.Undo]++;
break; break;
} }
case PropType.AddTime: case PropType.AddTime:
{ {
CurCoin -= LevelConstants.TimePropPrice; CurCoin -= LevelConstants.TimePropPrice;
tempLevelData.addTimeCount++; tempLevelData.addTimeCount++;
UnusedPropCount[PropType.AddTime]++; _unusedPropCount[PropType.AddTime]++;
break; break;
} }
case PropType.OpenHole: case PropType.OpenHole:
{ {
CurCoin -= LevelConstants.PropPrice; CurCoin -= LevelConstants.PropPrice;
tempLevelData.openHoleCount++; tempLevelData.openHoleCount++;
UnusedPropCount[PropType.OpenHole]++; _unusedPropCount[PropType.OpenHole]++;
break; break;
} }
} }
@ -147,18 +147,18 @@ namespace Gameplay.Manager
public void UseProp(PropType prop) public void UseProp(PropType prop)
{ {
var count = UnusedPropCount[prop] > 0 ? 1 : 0; var count = _unusedPropCount[prop] > 0 ? 1 : 0;
UnusedPropCount[prop] -= count; _unusedPropCount[prop] -= count;
} }
public void SettleCoins() public void SettleCoins()
{ {
var spareCoins = 0; var spareCoins = 0;
var updatedUnusedPropCount = new Dictionary<PropType, int>(UnusedPropCount); var updatedUnusedPropCount = new Dictionary<PropType, int>(_unusedPropCount);
for (int i = 0; i < UnusedPropCount.Count; i++) for (int i = 0; i < _unusedPropCount.Count; i++)
{ {
var prop = UnusedPropCount.ElementAt(i); var prop = _unusedPropCount.ElementAt(i);
switch (prop.Key) switch (prop.Key)
{ {
@ -176,7 +176,7 @@ namespace Gameplay.Manager
updatedUnusedPropCount[prop.Key] = 0; updatedUnusedPropCount[prop.Key] = 0;
} }
UnusedPropCount = updatedUnusedPropCount; _unusedPropCount = updatedUnusedPropCount;
DebugUtil.Log("surplus coins : {0}", spareCoins); DebugUtil.Log("surplus coins : {0}", spareCoins);
CurCoin += spareCoins; CurCoin += spareCoins;

30
Tool/Luban/.cache.meta
View File

@ -1,20 +1,20 @@
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,71A2B6B6709FE3FF4DE257362B4885C,1094,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,71A2B6B6709FE3FF4DE257362B4885C,1094,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,F9B531A897A2686FB7D07A8BFA6AABB,7213,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,448F97FC077CE499139EFC4854438,7226,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1719225182858
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1719208478807 /Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1719225182859
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,9966F8C0BCDDD717667BB975C9862F80,12651,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,9966F8C0BCDDD717667BB975C9862F80,12651,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,AF34F79C23336475A93B5ACEE819B6A,10886,1718685908734 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,AF34F79C23336475A93B5ACEE819B6A,10886,1718685908734
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,94BD1CE582A461FEF69E5F186F4FB516,9841,1719208462217 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,94BD1CE582A461FEF69E5F186F4FB516,9841,1719208462217
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733
/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,AE932D408FE5AC314C87D2C18FBE3476,12884,1718883875802 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,7928FA644D565490BF62C9F31161DF,12898,1719225115683

BIN
Tool/Luban/Datas/StringConfig.xlsx
View File

Binary file not shown.