zhangjiannan
|
67bc362bb7
|
Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
# Conflicts:
# Assets/CRC/game.asset
# Assets/ManagedResources/BG/changjing_07.JPG.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2025-04-09 11:35:36 +08:00 |
zhangjiannan
|
59a5ae3ec0
|
no message
|
2025-03-14 11:58:20 +08:00 |
zhangjiannan
|
1a82ba62bb
|
战斗界面大使馆反的
|
2024-11-06 16:34:53 +08:00 |
zhangjiannan
|
0b33bec089
|
textspacing修改
|
2024-11-05 16:25:55 +08:00 |
zhangjiannan
|
e4a90f4b94
|
修改prefab文本框字体
|
2024-11-05 15:02:33 +08:00 |
DESKTOP-MMO982B\User
|
55da43b09b
|
1
|
2024-11-01 14:48:39 +08:00 |
zhangjiannan
|
ecf0d6bbab
|
1
|
2024-10-23 16:42:13 +08:00 |
DESKTOP-MMO982B\User
|
fa6bddcb2e
|
本地化+适配
|
2024-10-10 14:52:20 +08:00 |
zhangjiannan
|
f65cef243e
|
1
|
2024-09-30 15:39:37 +08:00 |
DESKTOP-MMO982B\User
|
47e61b9857
|
称号本地化
|
2024-09-30 12:32:00 +08:00 |
zhangjiannan
|
a998282548
|
loading 图
|
2024-09-24 18:30:36 +08:00 |
DESKTOP-MMO982B\User
|
c6aaeb91f8
|
Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
# Conflicts:
# Assets/ManagedResources/BG/LoadingBG.jpg.meta
# Assets/ManagedResources/Fonts/HY-Sayeez.meta
# Assets/ManagedResources/Fonts/HY-Sayeez/HY-Sayeez.otf.meta
|
2024-09-24 18:17:57 +08:00 |
zhangjiannan
|
95921de93b
|
meta文件
|
2024-09-03 18:53:01 +08:00 |
luyao
|
352de7108e
|
【神将头像朝向修改左>右】
|
2021-11-27 16:45:05 +08:00 |
gaoxin
|
597a747848
|
【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置
|
2021-08-05 14:41:19 +08:00 |
JLIOSM1
|
d680e5a507
|
Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
# Assets/StreamingAssets/Res/PackConfig.txt
# Assets/StreamingAssets/Res/_ReadMe.md
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
# Assets/StreamingAssets/Res/loading1.png
# Assets/StreamingAssets/Res/loading1.png.meta
# Assets/StreamingAssets/Res/loading2.png
# Assets/StreamingAssets/Res/loading2.png.meta
# Assets/StreamingAssets/Res/loading3.png
# Assets/StreamingAssets/Res/loading3.png.meta
# Assets/StreamingAssets/Res/loading4.png
# Assets/StreamingAssets/Res/loading4.png.meta
# Assets/StreamingAssets/Res/loading5.png
# Assets/StreamingAssets/Res/loading5.png.meta
# Assets/StreamingAssets/Res/loading6.png
# Assets/StreamingAssets/Res/loading6.png.meta
# Assets/StreamingAssets/Res/loading_caohua.png.meta
# Assets/StreamingAssets/Res/loading_xipu.png.meta
# Assets/StreamingAssets/Res/login_caohua.png.meta
# Assets/StreamingAssets/Res/login_video.mp4.meta
# Assets/StreamingAssets/Res/login_xipu.png.meta
|
2021-07-21 17:15:36 +08:00 |
JLIOSM1
|
9009c07630
|
【StreamingAsset】修改Res文件夹的内容
|
2021-07-21 17:08:01 +08:00 |
jiaoyangna
|
4d8bf852d4
|
Revert "bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40"
This reverts commit 01b3f79c43.
|
2021-07-19 14:10:11 +08:00 |
jiaoyangna
|
01b3f79c43
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/19,14:09:40
|
2021-07-19 14:09:40 +08:00 |
gaoxin
|
2504268b55
|
【stream资源】修改StreamingAsset中的资源配置,添加视频配置
|
2021-07-16 16:06:35 +08:00 |
ZhangBiao
|
e250223aa2
|
【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a)
|
2021-07-08 15:55:04 +08:00 |
gaoxin
|
12bd0b64a1
|
Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
# Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
|
2021-06-17 10:26:13 +08:00 |
gaoxin
|
4f28f777b9
|
【添加包配置说明文件】
|
2021-06-16 18:55:11 +08:00 |
gaoxin
|
6bd67926e7
|
【包配置】优化登录界面的打开速度,添加登录界面视频背景配置字段
|
2021-06-16 18:46:46 +08:00 |
gaoxin
|
98b1518306
|
【添加stream配置】
|
2021-06-16 17:29:17 +08:00 |
gaoxin
|
488f1e8af0
|
【stream】外部资源添加
|
2021-06-16 10:48:53 +08:00 |
gaoxin
|
653d9bbd06
|
【meta】
|
2021-05-26 13:43:11 +08:00 |
jiaoyangna
|
0054f5e646
|
【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
|
2020-12-24 10:37:38 +08:00 |
gaoxin
|
30ff681aca
|
删除无用视频资源
|
2020-08-29 17:41:04 +08:00 |
JieLing
|
5e9448dd24
|
资源提交,
|
2020-08-14 17:35:18 +08:00 |
JieLing
|
acf9a73068
|
重复引用资源修改
|
2020-08-13 19:40:50 +08:00 |
jl_ios
|
02b7e07d20
|
删除无用的sdk资源,bugly添加缺少的文件
|
2020-08-11 14:04:05 +08:00 |
2han9B1a0
|
73c6cc9582
|
删除meta文件
|
2020-07-02 17:58:34 +08:00 |
JieLing
|
461c64b04a
|
svn逻辑同步
|
2020-07-02 14:53:44 +08:00 |
gaoxin
|
52f8a9922f
|
无用meta文件删除
|
2020-07-01 17:43:55 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |