gaoxin
|
e060430d61
|
【公会红包】修复滑动导致按钮位置错误
|
2021-03-27 15:20:26 +08:00 |
zhangqiang
|
095701c33f
|
【称号时装坐骑】初提
|
2021-03-26 20:06:08 +08:00 |
gaoxin
|
fd5ef82b5f
|
【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题
|
2021-03-26 10:13:05 +08:00 |
jiaoyangna
|
8aa411244e
|
灵兽秘卷修改提交
|
2021-03-25 16:21:34 +08:00 |
jiaoyangna
|
299a7ceff1
|
【天书秘卷】 修改
|
2021-03-25 15:34:05 +08:00 |
jiaoyangna
|
776353406d
|
灵兽提交
|
2021-03-25 14:05:58 +08:00 |
ZhangBiao
|
24fa8c17e2
|
Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-03-25 11:13:37 +08:00 |
zhangqiang
|
4939c4da92
|
【称号坐骑时装】部分资源提交
|
2021-03-24 16:31:14 +08:00 |
zhangqiang
|
d0da980a3f
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-24 10:37:22 +08:00 |
gaoxin
|
56d7244740
|
【适配】修复部分界面在全面屏下显示不全的问题
|
2021-03-23 19:08:21 +08:00 |
gaoxin
|
8644d27aaa
|
【界面优化】部分界面显示优化修改
|
2021-03-23 17:26:16 +08:00 |
jiaoyangna
|
fbed4d34ff
|
解锁条件修改
|
2021-03-23 17:10:04 +08:00 |
jiaoyangna
|
298946dd2d
|
Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-03-23 16:54:46 +08:00 |
jiaoyangna
|
44806a302d
|
红点提交
|
2021-03-23 16:52:19 +08:00 |
zhangqiang
|
3618464a15
|
【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格
|
2021-03-23 16:22:57 +08:00 |
jiaoyangna
|
3334257425
|
添加天书秘卷入口
|
2021-03-23 15:37:39 +08:00 |
jiaoyangna
|
cfa63c1830
|
筛选提交
|
2021-03-23 15:23:37 +08:00 |
jiaoyangna
|
2e31e176cc
|
红点提交
|
2021-03-23 15:16:38 +08:00 |
gaoxin
|
1b9173f931
|
【bug】修复充值界面在全面屏下文字显示不全的问题-expertpanel
|
2021-03-23 14:25:11 +08:00 |
gaoxin
|
671edf8366
|
【bug】修复充值界面在全面屏下文字显示不全的问题
|
2021-03-23 14:22:25 +08:00 |
ZhangBiao
|
dfa2efdc76
|
【大闹天宫】查看圣物文字过小调整
|
2021-03-23 10:11:36 +08:00 |
ZhangBiao
|
83040f2c87
|
【主城】预设结构调整
|
2021-03-23 09:54:11 +08:00 |
gaoxin
|
52cace8d64
|
【公会】援助界面文字和进度条分离显示
|
2021-03-22 20:17:06 +08:00 |
ZhangBiao
|
207d85e2a2
|
【牛气冲天】提交
|
2021-03-22 20:08:18 +08:00 |
wangzhenxing
|
1e2db6040e
|
皮肤称号坐骑预设修改
|
2021-03-22 17:31:55 +08:00 |
zhangqiang
|
d9dcba2574
|
【称号坐骑皮肤-----------】开始
|
2021-03-22 16:16:25 +08:00 |
jiaoyangna
|
a4facd8d13
|
天书秘卷
|
2021-03-22 15:16:29 +08:00 |
zhangqiang
|
2c3d846d04
|
【化虚坛加名字】
|
2021-03-19 18:26:54 +08:00 |
zhangqiang
|
853db67d9a
|
【化虚坛去掉屏蔽神将】
|
2021-03-19 18:00:46 +08:00 |
ZhangBiao
|
65f994b37b
|
【牛气冲天】提交
|
2021-03-19 15:16:49 +08:00 |
jiaoyangna
|
ec8ff74e61
|
Merge branch 'china/dev' into 0功能/天书秘卷
|
2021-03-19 15:11:37 +08:00 |
jiaoyangna
|
beb93b5ed9
|
天书秘卷
|
2021-03-19 14:37:24 +08:00 |
gaoxin
|
1b3e9460fe
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-19 14:19:13 +08:00 |
gaoxin
|
e9968d8517
|
【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置
|
2021-03-19 14:19:05 +08:00 |
jiaoyangna
|
7986167a58
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-19 11:46:12 +08:00 |
jiaoyangna
|
9b25228d56
|
【日常副本】页签左滑不复位
|
2021-03-19 11:46:00 +08:00 |
gaoxin
|
1320371eac
|
【优化】删除登录区服显示-选择区服界面文字位置修改
|
2021-03-19 11:43:20 +08:00 |
gaoxin
|
367f319b81
|
【优化】删除登录区服显示
|
2021-03-19 11:37:22 +08:00 |
gaoxin
|
3a43473a0c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-19 10:28:50 +08:00 |
gaoxin
|
c334f2df54
|
【bug】版号信息显示错误
|
2021-03-19 10:28:33 +08:00 |
ZhangBiao
|
cde26e679b
|
|
2021-03-18 20:34:49 +08:00 |
zhangqiang
|
e8acbe1c86
|
【自选箱提交】
|
2021-03-18 15:15:54 +08:00 |
ZhangBiao
|
487cd87339
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-18 14:42:34 +08:00 |
ZhangBiao
|
b479a8fa8b
|
首领来袭
|
2021-03-18 14:40:47 +08:00 |
zhangqiang
|
8200e72dd2
|
【神将碎片箱子】需要向下移,到框里
|
2021-03-18 14:25:05 +08:00 |
ZhangBiao
|
db3340d779
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-18 14:10:29 +08:00 |
ZhangBiao
|
97ae8966d7
|
【充值界面】
|
2021-03-18 14:10:23 +08:00 |
gaoxin
|
0f8f51eded
|
【bug】武将—>神将
|
2021-03-18 14:02:16 +08:00 |
gaoxin
|
a01f1024ec
|
【优化】挂机奖励提升内容位置调整
|
2021-03-18 13:47:03 +08:00 |
ZhangBiao
|
30c05503c1
|
【累充】
|
2021-03-18 11:23:15 +08:00 |
ZhangBiao
|
0d1c61ec89
|
【累计充值】
|
2021-03-18 10:47:20 +08:00 |
ZhangBiao
|
95ee2d301d
|
【主题活动】
|
2021-03-18 10:30:21 +08:00 |
ZhangBiao
|
2ba7583da3
|
【中文元修改】
|
2021-03-18 10:27:36 +08:00 |
jiaoyangna
|
98e2ad0e3b
|
【美元显示】解锁青龙秘宝
|
2021-03-18 09:56:02 +08:00 |
ZhangBiao
|
84788732a2
|
首充金额修改
|
2021-03-17 19:06:15 +08:00 |
gaoxin
|
7b28309e1c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 17:30:18 +08:00 |
gaoxin
|
40bfa7c586
|
【配置】国内相关修改
|
2021-03-17 17:30:13 +08:00 |
zhangqiang
|
f2b3df9721
|
【修改提交】
|
2021-03-17 17:27:53 +08:00 |
zhangqiang
|
d5f34e516c
|
【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉
|
2021-03-17 16:56:02 +08:00 |
jiaoyangna
|
adb3a1e750
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:20:22 +08:00 |
ZhangBiao
|
2e685100ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:17:50 +08:00 |
ZhangBiao
|
c8661ab384
|
【首领来袭】任务过小修改,
|
2021-03-17 16:17:41 +08:00 |
zhangqiang
|
38a6548a52
|
【充值】开服成长礼包道具太多,会重叠。
|
2021-03-17 16:15:55 +08:00 |
jiaoyangna
|
5963eb170b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 16:04:31 +08:00 |
zhangqiang
|
125a393167
|
【修bug】
|
2021-03-17 15:54:45 +08:00 |
jiaoyangna
|
95351b5bd1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 15:03:54 +08:00 |
ZhangBiao
|
4efb36a195
|
【八日登陆】资源修改
|
2021-03-17 14:37:56 +08:00 |
jiaoyangna
|
909ed03c04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 13:33:22 +08:00 |
ZhangBiao
|
bf3d732b69
|
【中文本地化】
|
2021-03-17 12:05:44 +08:00 |
jiaoyangna
|
31b808209e
|
主界面修改提交
|
2021-03-17 11:55:02 +08:00 |
jiaoyangna
|
dfd3c4acc6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-17 11:54:40 +08:00 |
ZhangBiao
|
15dec90220
|
【本地化】修改
|
2021-03-17 11:29:43 +08:00 |
jiaoyangna
|
36f4efedc8
|
主城优化修改
|
2021-03-17 10:38:07 +08:00 |
jiaoyangna
|
0cdd115646
|
Merge branch 'china/dev' into 0功能/天书秘卷
|
2021-03-16 18:32:52 +08:00 |
jiaoyangna
|
147d358e11
|
天书密卷
|
2021-03-16 17:37:32 +08:00 |
ZhangBiao
|
c2cab749f4
|
【首领来袭】位置调整
|
2021-03-16 17:09:18 +08:00 |
ZhangBiao
|
4528e23541
|
Merge branch 'china/dev' into 0活动开发聚集地/限时神装
|
2021-03-16 14:49:47 +08:00 |
ZhangBiao
|
86fdb9395b
|
Merge branch '0功能/本周版本优化内容' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
|
2021-03-15 10:51:17 +08:00 |
ZhangBiao
|
9be337324a
|
【限时神装】完成
|
2021-03-15 10:37:26 +08:00 |
ZhangBiao
|
17a9550df8
|
【首领来袭】
|
2021-03-13 15:52:50 +08:00 |
ZhangBiao
|
5334a7c7da
|
【首领来袭】
|
2021-03-13 12:57:31 +08:00 |
jiaoyangna
|
5be52f6b33
|
限时活动提交
(cherry picked from commit e3460c8b83)
|
2021-03-12 15:48:29 +08:00 |
ZhangBiao
|
8aad1eee56
|
【限时神装】
|
2021-03-12 14:31:53 +08:00 |
jiaoyangna
|
dd706075d2
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
|
2021-03-12 14:30:10 +08:00 |
ZhangBiao
|
24ea537bba
|
Merge branch 'master_xma_local' into 0活动开发聚集地/限时神装
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua
|
2021-03-11 15:15:09 +08:00 |
ZhangBiao
|
4a3b79fce7
|
【锻器阁】添加材料图标不对称
|
2021-03-10 17:57:19 +08:00 |
zhangqiang
|
d8e37cdc66
|
【大闹天宫前端合并修改提交】
|
2021-03-10 17:44:56 +08:00 |
zhangqiang
|
88d1464fb3
|
【大闹天宫前端修改提交】
|
2021-03-10 17:42:17 +08:00 |
zhangqiang
|
0ba3ebb44d
|
【大闹天宫修改】前端圣物战力 商店节点加妖晶显示
|
2021-03-10 17:33:13 +08:00 |
jiaoyangna
|
4121f24a27
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2021-03-10 13:50:38 +08:00 |
gaoxin
|
3daf6a11b3
|
【本地化】青龙秘宝活动时间显示优化
|
2021-03-10 11:19:20 +08:00 |
gaoxin
|
e725a887a9
|
【bug】修复公告界面显示错误
|
2021-03-09 18:31:19 +08:00 |
JieLing
|
abd4028923
|
【meta】打包后meta文件上传
|
2021-03-09 16:04:18 +08:00 |
gaoxin
|
460479779e
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-09 15:39:46 +08:00 |
gaoxin
|
13fbabf125
|
【bug】修复老包中文字重叠
|
2021-03-09 15:39:42 +08:00 |
ZhangBiao
|
cdc8d468cb
|
【灵兽界面】文字问题
|
2021-03-09 15:34:29 +08:00 |
gaoxin
|
141e60d493
|
【本地化】修复灵兽装备按钮默认显示英文的问题
|
2021-03-09 15:00:59 +08:00 |
gaoxin
|
766ba304ed
|
【本地化】法宝回收提示文本翻译,神将装备界面对比套装属性翻译,轩辕宝镜充值界面文本显示调整
|
2021-03-08 16:51:13 +08:00 |
gaoxin
|
2838044ac5
|
【本地化】鸿蒙阵提示界面显示修改
|
2021-03-08 16:16:27 +08:00 |
ZhangBiao
|
da0b2d010a
|
【本地化】签到宝箱下移
|
2021-03-08 11:00:33 +08:00 |
ZhangBiao
|
33d6f64785
|
【本地化】鸿蒙阵结果中文修改
|
2021-03-08 10:57:57 +08:00 |
gaoxin
|
0e62748aff
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 21:22:36 +08:00 |
gaoxin
|
7662a5b154
|
【本地化】灵兽技能文字左移
|
2021-03-07 21:22:23 +08:00 |
gaoxin
|
96086a40a4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 20:48:17 +08:00 |
gaoxin
|
22dbfc310c
|
【本地化】我要变强推荐阵容显示修改,热更大小保留小数点后两位,十绝阵奖励显示修改
|
2021-03-07 20:48:05 +08:00 |
gaoxin
|
0a251132e0
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 19:32:10 +08:00 |
gaoxin
|
b82352796e
|
【本地化】鸿蒙阵修复文字重叠
|
2021-03-07 19:14:30 +08:00 |
gaoxin
|
25af0a837a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 19:06:17 +08:00 |
gaoxin
|
bbca0ca426
|
【本地化】装备切换界面套装属性翻译,成就提示文字超框显示修改
|
2021-03-07 19:06:13 +08:00 |
gaoxin
|
e874afa2ea
|
【本地化】十绝阵结算还是会重叠
|
2021-03-07 18:00:12 +08:00 |
gaoxin
|
76d4d549e8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:54:51 +08:00 |
gaoxin
|
4e93380a99
|
【本地化】法宝升级界面文字重叠
|
2021-03-07 17:54:46 +08:00 |
jiaoyangna
|
17b6ae35b1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:52:27 +08:00 |
jiaoyangna
|
c86865b3dd
|
装备提交
|
2021-03-07 17:52:23 +08:00 |
gaoxin
|
89ff803da0
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:43:12 +08:00 |
gaoxin
|
f8dc9552c9
|
【本地化】十绝阵结算伤害文字重叠
|
2021-03-07 17:43:04 +08:00 |
DESKTOP-98AVA47\Administrator
|
270b53cab1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:36:23 +08:00 |
gaoxin
|
fb8637c613
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:31:43 +08:00 |
gaoxin
|
9156962e89
|
【本地化】限时召唤英雄名称显示不全
|
2021-03-07 17:31:25 +08:00 |
jiaoyangna
|
594ce2b53a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Message/MissionDailyTipPanel.prefab
|
2021-03-07 17:17:47 +08:00 |
jiaoyangna
|
bba9bf2b37
|
本地化提交
|
2021-03-07 17:17:23 +08:00 |
gaoxin
|
71bd8865fd
|
【本地化】青龙秘宝超框,成就完成提示超框
|
2021-03-07 17:15:33 +08:00 |
jiaoyangna
|
e02c48df84
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:00:55 +08:00 |
jiaoyangna
|
6d985b13e2
|
本地化
|
2021-03-07 17:00:50 +08:00 |
gaoxin
|
7c8cf16c98
|
【bug】修复图鉴界面打开报错
|
2021-03-07 16:43:07 +08:00 |
jiaoyangna
|
d62263859c
|
【本地化】竞技场界面时间修改
|
2021-03-07 16:28:45 +08:00 |
gaoxin
|
3175ef5eb2
|
【适配】鸿蒙阵屏幕适配修改
|
2021-03-07 16:19:53 +08:00 |
gaoxin
|
b8762232bc
|
【本地化】登录界面logo替换,不再扫光
|
2021-03-07 15:33:41 +08:00 |
jiaoyangna
|
64d267b232
|
乾坤宝盒时间调整
|
2021-03-07 15:32:28 +08:00 |
jiaoyangna
|
21a607b7c4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 15:16:47 +08:00 |
jiaoyangna
|
99dcf2ed40
|
灵兽等级显示错误修改
|
2021-03-07 15:16:40 +08:00 |
gaoxin
|
ac312d9227
|
【本地化】关闭一些界面显示
|
2021-03-07 14:58:16 +08:00 |
gaoxin
|
906c44ae95
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 14:57:12 +08:00 |
gaoxin
|
7490911418
|
【本地化】修改文本位置
|
2021-03-07 14:57:07 +08:00 |
jiaoyangna
|
6878db8818
|
限时招募提交
|
2021-03-07 14:40:48 +08:00 |
jiaoyangna
|
0b975da446
|
限时招募提交
|
2021-03-07 14:16:58 +08:00 |
zhangqiang
|
02821bf9d6
|
【本地化】
|
2021-03-05 18:35:32 +08:00 |
jiaoyangna
|
cdd2ec63f6
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-05 18:34:04 +08:00 |
jiaoyangna
|
bf45224c5f
|
升级修改提交
|
2021-03-05 18:33:46 +08:00 |
gaoxin
|
b8af05773d
|
【本地化】竞技场编队文字修改
|
2021-03-05 18:18:22 +08:00 |
zhangqiang
|
a9d251494c
|
【本地化】
|
2021-03-05 17:59:38 +08:00 |
ZhangBiao
|
9792e57e9b
|
【系统弹窗】提交
|
2021-03-05 17:27:57 +08:00 |
zhangqiang
|
e9bd743af5
|
【本地化】
|
2021-03-05 17:18:07 +08:00 |
gaoxin
|
f11127e3cc
|
【本地化】限时礼包预设漏提交,成就文字过长修改
|
2021-03-05 16:57:48 +08:00 |
zhangqiang
|
ea3ad6d934
|
【本地化】
|
2021-03-05 16:26:39 +08:00 |
jiaoyangna
|
1937e33d8e
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expert/PatFacePanel.prefab
|
2021-03-05 16:07:20 +08:00 |
jiaoyangna
|
91f1fefe1a
|
本地化提交
|
2021-03-05 16:06:51 +08:00 |
zhangqiang
|
9f1b0aa44b
|
【本地化】
|
2021-03-05 15:55:54 +08:00 |
ZhangBiao
|
16982ef939
|
提交
|
2021-03-05 15:19:47 +08:00 |
zhangqiang
|
0af293c7d9
|
【巅峰赛 部分】
|
2021-03-05 15:12:15 +08:00 |
gaoxin
|
a8052da594
|
【本地化】优化战斗内文字显示
|
2021-03-05 15:04:14 +08:00 |
jiaoyangna
|
d1f18c39b3
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-05 14:01:03 +08:00 |
jiaoyangna
|
7c5fd4408e
|
本地化提交
|
2021-03-05 14:00:45 +08:00 |
zhangqiang
|
fec790a1e0
|
【宝物强化】
|
2021-03-05 13:54:08 +08:00 |
jiaoyangna
|
6a777d71c6
|
十绝阵文字重叠提交
|
2021-03-05 11:58:29 +08:00 |
jiaoyangna
|
28582fb4f6
|
本地化
|
2021-03-05 11:51:30 +08:00 |
jiaoyangna
|
37e5733d1a
|
本地化
|
2021-03-05 11:45:42 +08:00 |
zhangqiang
|
1364517cfb
|
修改
|
2021-03-05 11:27:28 +08:00 |
jiaoyangna
|
1acfbabcde
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 21:33:24 +08:00 |
jiaoyangna
|
29f1ae90e0
|
预设提交
|
2021-03-04 21:33:19 +08:00 |
zhangqiang
|
d249f78e8f
|
【灵兽特惠】
|
2021-03-04 21:22:02 +08:00 |
zhangqiang
|
a29e0db487
|
【主题活动】
|
2021-03-04 20:18:37 +08:00 |
jiaoyangna
|
21e0998228
|
图片提交
|
2021-03-04 20:17:22 +08:00 |
zhangqiang
|
0f25668d0f
|
【1008主题活动修改】
|
2021-03-04 19:50:26 +08:00 |
zhangqiang
|
c54e899684
|
【live2d导入】0025
|
2021-03-04 19:20:08 +08:00 |
jiaoyangna
|
ba7a5fbb18
|
本地化提交
|
2021-03-04 19:04:33 +08:00 |
zhangqiang
|
0b9394188a
|
【修改
|
2021-03-04 19:03:09 +08:00 |
zhangqiang
|
3d9d5b0ed3
|
【20201001主题】
|
2021-03-04 16:58:28 +08:00 |
zhangqiang
|
4fadb8e763
|
【新live2d导入】缺0025
|
2021-03-04 15:56:29 +08:00 |
zhangqiang
|
249cddb935
|
【显示兑换】
|
2021-03-04 15:18:31 +08:00 |
zhangqiang
|
6bbb1c7671
|
Revert "【新live2】导入 缺25"
This reverts commit 7d8145a3b9.
|
2021-03-04 15:16:46 +08:00 |
zhangqiang
|
86fd6724c1
|
【圣物选择】
|
2021-03-04 14:58:41 +08:00 |
zhangqiang
|
7d8145a3b9
|
【新live2】导入 缺25
|
2021-03-04 11:44:19 +08:00 |
ZhangBiao
|
052767a836
|
【本地化】鸿蒙阵修改
|
2021-03-04 11:05:19 +08:00 |
ZhangBiao
|
7805c09f4d
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 10:16:42 +08:00 |
ZhangBiao
|
7d678094a3
|
【本地化】
|
2021-03-04 10:16:31 +08:00 |
jiaoyangna
|
90a87ee396
|
本地化 提交
|
2021-03-04 10:16:07 +08:00 |
ZhangBiao
|
a7e578eea8
|
【本地化】
|
2021-03-03 18:31:18 +08:00 |
ZhangBiao
|
4861711fbc
|
【本地化】
|
2021-03-03 18:25:34 +08:00 |
ZhangBiao
|
37dcb0d6ad
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 18:07:38 +08:00 |
ZhangBiao
|
c7ab8fcb8b
|
【本地化】
|
2021-03-03 18:07:29 +08:00 |
jiaoyangna
|
ef65fb91f4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 17:46:19 +08:00 |
jiaoyangna
|
cf5300bab2
|
图片提交
|
2021-03-03 17:46:08 +08:00 |
zhangqiang
|
1e1c325229
|
【神将】
|
2021-03-03 17:45:34 +08:00 |
ZhangBiao
|
f01cdd582e
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 17:04:26 +08:00 |
ZhangBiao
|
6fe7b9ed28
|
【本地化】
|
2021-03-03 17:04:17 +08:00 |
zhangqiang
|
1ffe352007
|
【灵兽】
|
2021-03-03 16:59:52 +08:00 |
zhangqiang
|
59c2caaede
|
【送神祠本地化修改】
|
2021-03-03 15:51:04 +08:00 |
ZhangBiao
|
09b534b44f
|
【本地化】
|
2021-03-03 15:36:17 +08:00 |
jiaoyangna
|
ac5968285c
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 14:19:38 +08:00 |
jiaoyangna
|
c6f716f1ba
|
主城修改
|
2021-03-03 14:19:34 +08:00 |
zhangqiang
|
bbb7a48e07
|
福利
|
2021-03-03 14:15:18 +08:00 |
jiaoyangna
|
4e90f04c9d
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 12:01:21 +08:00 |
jiaoyangna
|
651f328f95
|
服务器列表 提交
|
2021-03-03 12:01:17 +08:00 |
ZhangBiao
|
caaf50cf91
|
【本地化】
|
2021-03-03 11:30:06 +08:00 |
ZhangBiao
|
ff70c8d635
|
【本地化】竞技场 积天豪礼
|
2021-03-03 10:07:13 +08:00 |
jiaoyangna
|
0851e8e1b8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 21:06:46 +08:00 |
jiaoyangna
|
ea6e1f242c
|
灵兽界面修改提交
|
2021-03-02 21:06:42 +08:00 |
ZhangBiao
|
e9e18121d2
|
【本地化】逍遥游
|
2021-03-02 19:58:05 +08:00 |
jiaoyangna
|
22b64d085d
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 18:05:10 +08:00 |
jiaoyangna
|
f7a06a5783
|
竞技守卫修改
|
2021-03-02 18:05:06 +08:00 |
ZhangBiao
|
eee28b7a6c
|
【本地化】
|
2021-03-02 17:45:04 +08:00 |
jiaoyangna
|
45c90098b2
|
预设提交
|
2021-03-02 17:11:00 +08:00 |
jiaoyangna
|
d5076fde3c
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 16:44:43 +08:00 |
jiaoyangna
|
bdb47125a6
|
Merge branch 'local_to_dev' into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildMemberInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
# FontArt/ArtFont_zh/hongmengzhen_zh.png
# FontArt/ArtFont_zh/jianmushenshu_zh.png
# FontArt/ArtFont_zh/silingshilian_zh.png
|
2021-03-02 16:44:38 +08:00 |
ZhangBiao
|
be6b55ce43
|
【两个备份预设提交】
|
2021-03-02 16:11:15 +08:00 |
ZhangBiao
|
e6a076afa8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 14:45:52 +08:00 |
ZhangBiao
|
3681714bb0
|
【本地化】牛转钱坤
|
2021-03-02 14:45:40 +08:00 |
jiaoyangna
|
571591eb81
|
竞技场修改提交
|
2021-03-02 11:59:01 +08:00 |
ZhangBiao
|
54cfbac8fa
|
【本地化】巅峰赛白片
|
2021-03-02 10:57:07 +08:00 |
ZhangBiao
|
fc08ad0bdf
|
【本地化】
|
2021-03-01 18:29:21 +08:00 |
ZhangBiao
|
01e39e0435
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-01 17:27:15 +08:00 |
ZhangBiao
|
dab25d828f
|
【本地化】
|
2021-03-01 17:27:06 +08:00 |
jiaoyangna
|
6506a48bad
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-01 17:06:09 +08:00 |
jiaoyangna
|
f07c4c3952
|
字体修改提交
|
2021-03-01 17:06:03 +08:00 |
ZhangBiao
|
aef41d8157
|
【本地化】
|
2021-03-01 16:18:34 +08:00 |
ZhangBiao
|
72f28280ee
|
【本地化】排行榜显示跳行
|
2021-03-01 11:39:07 +08:00 |
ZhangBiao
|
a3debe0e0e
|
【本地化】英文版本首次试炼必得五星显示不全
|
2021-03-01 11:34:05 +08:00 |
zhangqiang
|
1604821615
|
【ScrollCycleView】修改5
|
2021-02-27 16:51:55 +08:00 |
zhangqiang
|
8e9c439623
|
【越南语】修改
|
2021-02-27 16:36:05 +08:00 |
zhangqiang
|
9739ff3090
|
【越南语】修改
|
2021-02-27 16:21:23 +08:00 |
gaoxin
|
bca617284b
|
【本地化】重置选择神将界面文字超框显示修改
|
2021-02-27 15:52:11 +08:00 |
zhangqiang
|
7a7196f93a
|
【越南语】修改
|
2021-02-27 15:42:50 +08:00 |
gaoxin
|
ae39622310
|
【本地化】充值界面文字显示错乱修改
|
2021-02-27 15:22:24 +08:00 |
gaoxin
|
b3ba0826d9
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-27 14:51:19 +08:00 |
gaoxin
|
d575bd1313
|
【本地化】升级,最大星级白片修改
|
2021-02-27 14:51:14 +08:00 |
zhangqiang
|
efd3ab9216
|
【越南包】问题修改
|
2021-02-27 14:47:57 +08:00 |
gaoxin
|
570352ea2c
|
【本地化】鸿蒙阵按钮资源修改,三界降魔按钮文字资源
|
2021-02-27 14:34:36 +08:00 |
liujiaqi
|
59cfcff035
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-26 17:26:39 +08:00 |
liujiaqi
|
8a00efca60
|
共鸣 英雄界面 提交
|
2021-02-26 17:26:17 +08:00 |
JieLing
|
619b3d9983
|
【本地化】挂机界面优化
|
2021-02-26 17:16:37 +08:00 |
zhangqiang
|
25f527f065
|
【ScrollCycleView】修改5
|
2021-02-26 14:52:59 +08:00 |
ZhangBiao
|
fbe63e5ccf
|
【首领来袭】增加动画
|
2021-02-26 14:07:22 +08:00 |
ZhangBiao
|
a3f8b35225
|
Merge branch '0优化/战斗增加boss详情' into 0功能/本周版本优化内容
|
2021-02-26 11:04:41 +08:00 |
ZhangBiao
|
338ed4d13f
|
【首领来袭】提交
|
2021-02-26 11:03:14 +08:00 |
jiaoyangna
|
9f05f94439
|
本地化
|
2021-02-26 10:53:37 +08:00 |
jiaoyangna
|
3f38b704be
|
已修改
|
2021-02-26 10:32:02 +08:00 |
jiaoyangna
|
f08477cbd6
|
积分礼包领不了
|
2021-02-25 21:45:52 +08:00 |
jiaoyangna
|
bacf88be86
|
日志,本地化修改
|
2021-02-25 21:42:38 +08:00 |
ZhangBiao
|
3ddc796ec2
|
【首领来袭】完成
|
2021-02-25 21:08:11 +08:00 |
jiaoyangna
|
e46d735134
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 18:36:55 +08:00 |
jiaoyangna
|
69a2253d12
|
装备提交
|
2021-02-25 18:36:50 +08:00 |
gaoxin
|
20622e5e62
|
【本地化】文字自适应大小并自动换行
|
2021-02-25 17:46:32 +08:00 |
gaoxin
|
c6430f59a5
|
【本地化】乾坤宝盒界面相关修改
|
2021-02-25 17:31:26 +08:00 |
gaoxin
|
5a4742610a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 16:12:51 +08:00 |
gaoxin
|
22536f7076
|
【本地化】限时召唤,按钮拉长,气泡随文字多少变化
|
2021-02-25 16:12:46 +08:00 |
jiaoyangna
|
f25d5b7242
|
合成神将修改
|
2021-02-25 15:56:52 +08:00 |
jiaoyangna
|
d2dbaec760
|
英雄合成提交
|
2021-02-25 15:46:27 +08:00 |
jiaoyangna
|
4c88ab3c39
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 15:41:44 +08:00 |
jiaoyangna
|
3a31425e5a
|
装备合成界面修改
|
2021-02-25 15:41:34 +08:00 |
gaoxin
|
2f59385c18
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 15:38:34 +08:00 |
gaoxin
|
7ea798b693
|
【本地化】部分活动介绍界面内容改为可滑动
|
2021-02-25 15:38:27 +08:00 |
jiaoyangna
|
0e80a3ee5a
|
玩家信息界面修改
|
2021-02-25 15:28:08 +08:00 |
jiaoyangna
|
ee5e5777f3
|
社稷大点, 活动任务提交
|
2021-02-25 15:20:49 +08:00 |
jiaoyangna
|
db9f456676
|
没有翻译图片显示中文
|
2021-02-25 15:10:44 +08:00 |
jiaoyangna
|
fc28bb9e35
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab
|
2021-02-25 14:20:51 +08:00 |
jiaoyangna
|
df38aea68e
|
巅峰赛修改
|
2021-02-25 14:20:29 +08:00 |
jiaoyangna
|
c3c1f6abf9
|
去掉颜色显隐
|
2021-02-25 14:19:45 +08:00 |
ZhangBiao
|
b2dbdfe599
|
【本地化】page12 14 jumpview
|
2021-02-25 13:31:27 +08:00 |
ZhangBiao
|
9a54660c1f
|
【本地化】降妖夺宝 新将来袭
|
2021-02-25 11:24:43 +08:00 |
ZhangBiao
|
468731dc53
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-25 11:17:10 +08:00 |
ZhangBiao
|
1c52db19b6
|
【本地化】page 2 10 12 13 mainshop
|
2021-02-25 11:17:00 +08:00 |
jiaoyangna
|
e953005b6e
|
活动排行 灵兽抽卡 修改
|
2021-02-25 10:41:07 +08:00 |
jiaoyangna
|
9cd02c5063
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 21:03:40 +08:00 |
jiaoyangna
|
dd3e202ae3
|
图片提交
|
2021-02-24 21:03:36 +08:00 |
ZhangBiao
|
58d0b7874f
|
【本地化】
|
2021-02-24 20:57:28 +08:00 |
ZhangBiao
|
83306455e9
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 20:56:28 +08:00 |
ZhangBiao
|
61b22edef5
|
【本地化】提交
|
2021-02-24 20:56:01 +08:00 |
jiaoyangna
|
10759be394
|
大闹天宫提交
|
2021-02-24 20:32:54 +08:00 |
jiaoyangna
|
19a743a74b
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 20:25:40 +08:00 |
jiaoyangna
|
dc68abaf55
|
大闹天宫
|
2021-02-24 20:25:29 +08:00 |
ZhangBiao
|
180ad3ab31
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 20:25:08 +08:00 |
ZhangBiao
|
5834e08ee2
|
【本地化】提交
|
2021-02-24 20:24:58 +08:00 |
jiaoyangna
|
b6f00fd4e8
|
车迟提交
|
2021-02-24 19:55:50 +08:00 |
jiaoyangna
|
affb12060a
|
心魔 修改提交
|
2021-02-24 18:27:53 +08:00 |
jiaoyangna
|
ba8c822b3f
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 18:23:50 +08:00 |
jiaoyangna
|
a34bd942bf
|
极速探索提交
|
2021-02-24 18:23:40 +08:00 |
ZhangBiao
|
42d6c9e8b9
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 18:17:54 +08:00 |
ZhangBiao
|
f8bc361605
|
【本地化】首充 四元阵
|
2021-02-24 18:17:46 +08:00 |
jiaoyangna
|
d403acaf58
|
等级礼包修改提交
|
2021-02-24 18:13:55 +08:00 |
jiaoyangna
|
e9d02d8006
|
天尊降世修改
|
2021-02-24 18:07:44 +08:00 |
jiaoyangna
|
ee8a721624
|
灵兽抽卡修改
|
2021-02-24 18:00:19 +08:00 |
jiaoyangna
|
48c959e302
|
森罗左下角修改
|
2021-02-24 17:40:35 +08:00 |
jiaoyangna
|
e52b646c3a
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 17:38:12 +08:00 |
jiaoyangna
|
e42193d264
|
轩辕,森罗修改
|
2021-02-24 17:37:56 +08:00 |
ZhangBiao
|
5c5704cdf1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 17:36:35 +08:00 |
ZhangBiao
|
16a4fa4dde
|
【本地化】灵兽界面 福利界面
|
2021-02-24 17:36:24 +08:00 |
jiaoyangna
|
fd2626bfb1
|
青龙秘宝修改
|
2021-02-24 15:41:23 +08:00 |
jiaoyangna
|
ab27a768cf
|
青龙秘宝修改
|
2021-02-24 15:37:17 +08:00 |
jiaoyangna
|
4b05af8b04
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 15:14:12 +08:00 |
jiaoyangna
|
d65037420c
|
排行榜提交
|
2021-02-24 15:13:57 +08:00 |
gaoxin
|
6b128d46ef
|
Merge branch 'xma/dev_temp' into xma/dev
|
2021-02-24 15:08:38 +08:00 |
jiaoyangna
|
541b45e6ea
|
排行榜提交
|
2021-02-24 15:07:31 +08:00 |
jiaoyangna
|
aae09643f0
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 14:52:28 +08:00 |
jiaoyangna
|
08cafc0ce9
|
限时活动,活动排行 修改
|
2021-02-24 14:52:18 +08:00 |
ZhangBiao
|
1d7f5572cb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 14:45:16 +08:00 |
ZhangBiao
|
10e8da678a
|
【本地化】天宫寻宝相关修改
|
2021-02-24 14:45:09 +08:00 |
jiaoyangna
|
af1bb0eb78
|
礼包抢购 积天豪礼 修改
|
2021-02-24 14:04:32 +08:00 |
jiaoyangna
|
0e1495adcb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 12:04:49 +08:00 |
jiaoyangna
|
5088768f6c
|
探宝修改
|
2021-02-24 12:04:39 +08:00 |
jiaoyangna
|
abf4322b79
|
幸运探宝修改
|
2021-02-24 12:02:36 +08:00 |
ZhangBiao
|
7338db75ad
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 11:47:15 +08:00 |
ZhangBiao
|
fc7879a56a
|
【本地化】我要变强 首充
|
2021-02-24 11:47:07 +08:00 |
jiaoyangna
|
d7bee8c711
|
十绝阵奖励修改
|
2021-02-24 11:46:07 +08:00 |
jiaoyangna
|
73e973824d
|
vip 提交
|
2021-02-24 11:39:00 +08:00 |
ZhangBiao
|
f3e44753e2
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 11:24:01 +08:00 |
ZhangBiao
|
74185b0d1b
|
【本地化】
|
2021-02-24 11:23:53 +08:00 |
jiaoyangna
|
45a4b740d2
|
红包修改提交
|
2021-02-24 11:15:03 +08:00 |
jiaoyangna
|
22dcb8c487
|
公会红包修改
|
2021-02-24 10:44:00 +08:00 |
jiaoyangna
|
6a0dc005eb
|
公会技能重置修改
|
2021-02-24 10:23:15 +08:00 |
jiaoyangna
|
fc75b356b0
|
公会修改
|
2021-02-24 10:21:44 +08:00 |
ZhangBiao
|
8e0b99ba8b
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 10:04:36 +08:00 |
ZhangBiao
|
29aa15c12f
|
【本地化】灵兽界面调整
|
2021-02-24 10:04:28 +08:00 |
jiaoyangna
|
de3cc09086
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-24 09:54:25 +08:00 |
jiaoyangna
|
71c86423ac
|
十绝阵提交
|
2021-02-24 09:54:21 +08:00 |
ZhangBiao
|
91f46cb250
|
【本地化】森罗幻境修改
|
2021-02-24 09:48:22 +08:00 |
zhangqiang
|
497729e762
|
【优化】查找合成的时候英雄名字查找困难 英雄名字放在主页上
|
2021-02-23 20:50:56 +08:00 |
jiaoyangna
|
576400a914
|
公会商店本地化修改提交
|
2021-02-23 20:50:34 +08:00 |
jiaoyangna
|
59af047cd9
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-23 20:18:32 +08:00 |
jiaoyangna
|
f5450e201d
|
公会提交
|
2021-02-23 20:18:25 +08:00 |
ZhangBiao
|
82db5c4b57
|
【本地化】排行榜修改
|
2021-02-23 20:13:59 +08:00 |
gaoxin
|
169ad402c7
|
【本地化】修复白片得问题
|
2021-02-23 19:12:16 +08:00 |
ZhangBiao
|
1c77912e61
|
【本地化】开服狂欢修改
|
2021-02-23 18:15:15 +08:00 |
ZhangBiao
|
543e0b7b22
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-23 17:43:08 +08:00 |
ZhangBiao
|
5d1b8bf9b9
|
【本地化】界面挑战
|
2021-02-23 17:41:59 +08:00 |
jiaoyangna
|
7fbcd27b69
|
日常任务界面页签修改
|
2021-02-23 17:41:50 +08:00 |
jiaoyangna
|
cc9cb65b33
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-23 17:07:33 +08:00 |
ZhangBiao
|
64e2464cf9
|
【本地化】预设位置调整
|
2021-02-23 17:04:52 +08:00 |
jiaoyangna
|
b79613bde7
|
图片提交
|
2021-02-23 16:52:37 +08:00 |
ZhangBiao
|
f8537fb048
|
【本地化】英雄装备 魂印界面修改
|
2021-02-23 15:33:24 +08:00 |
ZhangBiao
|
3674cdd886
|
【本地化】神将装备界面调整
|
2021-02-23 14:57:04 +08:00 |
ZhangBiao
|
bec4de4ae2
|
【本地化】英雄界面下方页签调整
|
2021-02-23 14:20:39 +08:00 |
jiaoyangna
|
6eb45cd1e6
|
预设白片提交
|
2021-02-23 10:51:52 +08:00 |
jiaoyangna
|
2044d5c903
|
主城提交
|
2021-02-23 09:51:37 +08:00 |
ZhangBiao
|
b994557866
|
【boss介绍界面】创建提交
|
2021-02-22 20:19:16 +08:00 |
jiaoyangna
|
c4883087a5
|
lua 提交
|
2021-02-22 16:35:25 +08:00 |
jiaoyangna
|
a05694855c
|
Merge branch 'local_to_xmadev' into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
|
2021-02-20 17:55:52 +08:00 |
jiaoyangna
|
bb6e7c47a2
|
皮肤界面修改提交
|
2021-02-20 15:35:31 +08:00 |
jiaoyangna
|
f0485649ab
|
预设修改提交
|
2021-02-20 14:40:01 +08:00 |
jiaoyangna
|
3b7ff95aaf
|
属性图标修改提交
|
2021-02-19 18:18:09 +08:00 |
ZhangBiao
|
bc5410db23
|
【神衣天降】UI调整
|
2021-02-19 11:17:24 +08:00 |
zhangqiang
|
1c95b576f0
|
Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-02-19 10:54:36 +08:00 |
zhangqiang
|
ce17741169
|
【大闹天宫】界面微调
|
2021-02-18 18:31:30 +08:00 |
zhangqiang
|
2b25d19602
|
【资源导入】
|
2021-02-18 17:59:43 +08:00 |
jiaoyangna
|
f15fa6f1f9
|
越南语图片提交
|
2021-02-18 17:21:14 +08:00 |
zhangqiang
|
aa40bb1775
|
【资源提交】 立绘 c_gyps_00020_s1 + 技能特效 Effect_tiannv
|
2021-02-18 17:06:24 +08:00 |
zhangqiang
|
748060a839
|
【魂印合成】 合成选择界面名字位置调高
|
2021-02-18 15:37:11 +08:00 |
zhangqiang
|
55c8fd1ec6
|
【编队】编队界面,点击第三排头像,底部点击没反应
|
2021-02-05 17:24:13 +08:00 |
gaoxin
|
78e7305c15
|
【本地化】导出中文
|
2021-02-05 15:58:37 +08:00 |
gaoxin
|
e9ea58aaf3
|
【本地化】界面冲突修正
|
2021-02-05 15:45:23 +08:00 |
gaoxin
|
90bf24b3b0
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/CourtesyDressPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
|
2021-02-05 14:30:05 +08:00 |
gaoxin
|
2c5c7a5b78
|
【本地化】限时折扣界面背景全屏显示
|
2021-02-04 11:32:15 +08:00 |
gaoxin
|
41f1818609
|
【本地化】修复中文等级提升界面显示了英文的问题
|
2021-02-04 10:32:08 +08:00 |
gaoxin
|
19ea17f6b2
|
【本地化】胜利界面本地化修改
|
2021-02-04 10:25:55 +08:00 |
gaoxin
|
51bdf1055e
|
【本地化】公会名称,宣言修改界面文字显示重叠问题修复
|
2021-02-04 10:15:48 +08:00 |
gaoxin
|
19d241f44e
|
【本地化】优化显示错误
|
2021-02-01 19:33:03 +08:00 |
jiaoyangna
|
21ecb784d8
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-29 18:52:55 +08:00 |
jiaoyangna
|
5d1420ff90
|
逍遥游特效修改提交
|
2021-01-29 18:52:46 +08:00 |
DESKTOP-98AVA47\Administrator
|
f0e2df5aed
|
【本地化】
|
2021-01-29 14:36:50 +08:00 |
gaoxin
|
47e7f645eb
|
【本地化】竞技场显示优化
|
2021-01-29 14:27:33 +08:00 |
gaoxin
|
ce0a7ed874
|
【本地化】界面显示优化
|
2021-01-29 14:09:52 +08:00 |
DESKTOP-98AVA47\Administrator
|
356068f4cb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-01-29 13:56:29 +08:00 |
DESKTOP-98AVA47\Administrator
|
531592ae3d
|
【本地化】
|
2021-01-29 13:55:55 +08:00 |
gaoxin
|
bf3a6eb705
|
【本地化】界面显示问题修复
|
2021-01-29 13:34:16 +08:00 |
DESKTOP-98AVA47\Administrator
|
839dd3b343
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-01-29 12:29:49 +08:00 |
DESKTOP-98AVA47\Administrator
|
3878baa2eb
|
【本地化】鸿蒙结果文字位置 兽潮排行层数文字
|
2021-01-29 12:28:16 +08:00 |
DESKTOP-98AVA47\Administrator
|
8d2aeb2f0a
|
【本地化】十绝阵奖励上方文字
|
2021-01-29 11:26:22 +08:00 |
ZhangBiao
|
0d50ff5f38
|
【钱坤宝盒】金色必出描述修改
|
2021-01-28 17:46:36 +08:00 |
gaoxin
|
d6771be0cf
|
【本地化】修复青龙秘宝白片,优化gm界面显示,探宝商品名称改为读取物品表
|
2021-01-28 17:29:41 +08:00 |
yuanshuai
|
b086c4cf41
|
自动游历功能屏蔽
|
2021-01-28 16:21:47 +08:00 |
gaoxin
|
f2377abd08
|
【本地化】好友页签显示本地化适配
|
2021-01-28 16:19:42 +08:00 |
gaoxin
|
9559607b51
|
【本地化】部分扫光特效处理,充值界面妖精文字改图标
|
2021-01-28 15:37:44 +08:00 |
ZhangBiao
|
9bc67febc2
|
Merge branch '0功能/本周版本优化内容' into 0功能/按钮优化
|
2021-01-28 13:41:06 +08:00 |
ZhangBiao
|
2d5d0f0c10
|
【按钮优化】开服狂欢 百宝商会 升级好礼
|
2021-01-28 11:58:41 +08:00 |
gaoxin
|
9816db8f36
|
【本地化】错误修正,添加GM测试功能引导
|
2021-01-28 11:42:05 +08:00 |
ZhangBiao
|
5d757400cc
|
【按钮优化】每日任务 青龙秘宝
|
2021-01-28 10:51:38 +08:00 |
ZhangBiao
|
dbf91a5db4
|
【按钮优化】累计充值 主题任务 通关好礼
|
2021-01-28 10:19:38 +08:00 |
ZhangBiao
|
7cc06d1ef1
|
【按钮优化】周月礼包
|
2021-01-28 09:37:48 +08:00 |
gaoxin
|
48ffaf2470
|
【本地化】预设文字导出
|
2021-01-27 18:17:32 +08:00 |
ZhangBiao
|
b3fc25de10
|
【按钮优化】七种达人 + 周卡 限时兑换
|
2021-01-27 16:36:36 +08:00 |
ZhangBiao
|
8901e7d4e6
|
【按钮优化】充值 积天豪礼
|
2021-01-27 16:12:39 +08:00 |
gaoxin
|
4ef9c154ab
|
【本地化】背包界面物品可合成时白片问题修复
|
2021-01-27 14:29:11 +08:00 |
gaoxin
|
e0788a63ce
|
【本地化】资源同步
|
2021-01-27 13:49:15 +08:00 |
ZhangBiao
|
a6911749d2
|
Merge branch '0活动开发聚集地/牛转乾坤' into 0功能/本周版本优化内容
|
2021-01-27 13:41:56 +08:00 |
ZhangBiao
|
7b686298c8
|
【按钮优化】充值界面
|
2021-01-27 10:02:58 +08:00 |
zhangqiang
|
571a69888a
|
【优化】抽将动画可以点击跳过
|
2021-01-26 18:52:03 +08:00 |
gaoxin
|
12356f5ed7
|
【本地化】预设提交
|
2021-01-26 17:48:24 +08:00 |
ZhangBiao
|
3254df8f6f
|
【降妖夺宝】预设补提
|
2021-01-26 17:26:08 +08:00 |
ZhangBiao
|
560b5557f7
|
【牛转乾坤】扫光特效修改
|
2021-01-26 14:04:13 +08:00 |
ZhangBiao
|
78bc7e8ab3
|
Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤
|
2021-01-26 13:49:08 +08:00 |
ZhangBiao
|
0651220248
|
【牛转乾坤】特效提交
|
2021-01-26 13:47:30 +08:00 |
zhangqiang
|
a2ed23dd24
|
Revert "tips loading tijiao"
This reverts commit 27066d7033.
|
2021-01-26 11:00:12 +08:00 |
jiaoyangna
|
22aee8fe41
|
tips loading tijiao
|
2021-01-26 10:59:32 +08:00 |
ZhangBiao
|
78f6e3bea3
|
【限时神装】主城界面icon提交
|
2021-01-26 09:38:36 +08:00 |
jiaoyangna
|
27066d7033
|
tips loading tijiao
|
2021-01-25 18:10:14 +08:00 |
guowei
|
13cafd1364
|
【预设修改】
|
2021-01-25 16:45:49 +08:00 |
jiaoyangna
|
4ec73a4a8d
|
召唤,抽取,招募 文字修改
|
2021-01-22 15:52:02 +08:00 |
ZhangBiao
|
9e14cada49
|
【牛转钱坤】完事了
|
2021-01-21 15:10:27 +08:00 |
zhangqiang
|
fc167398d6
|
【神将】神将上限999,继续通过碎片合成会导致游戏崩溃
|
2021-01-21 11:10:29 +08:00 |
ZhangBiao
|
20857d4e27
|
【牛转钱坤】差不多完事了
|
2021-01-20 18:27:23 +08:00 |
ZhangBiao
|
0146bc8512
|
【牛转钱坤】代码提交
|
2021-01-20 15:31:39 +08:00 |
ZhangBiao
|
158bf92955
|
【牛转乾坤】资源提交
|
2021-01-20 14:52:12 +08:00 |
guowei
|
d85cb48f6d
|
【鸿蒙阵缺陷修改】
|
2021-01-20 10:37:02 +08:00 |
zhangqiang
|
9a50a111c7
|
【资源导入】 白骨精皮肤例会 观音例会替换
|
2021-01-19 14:31:01 +08:00 |
ZhangBiao
|
20fd353f51
|
【限时神装】增加拍脸
|
2021-01-18 16:20:42 +08:00 |
ZhangBiao
|
d7f4ad06ba
|
【限时神装】界面基本完成,差拍脸
|
2021-01-18 15:36:00 +08:00 |
gaoxin
|
ceb9e39b00
|
【战斗统计】第二版
|
2021-01-16 16:23:06 +08:00 |
gaoxin
|
6f386e1b52
|
【战斗统计】第一版
|
2021-01-16 16:22:57 +08:00 |
DESKTOP-98AVA47\Administrator
|
8f437f407d
|
【本周优化修改】
|
2021-01-15 22:11:38 +08:00 |
ZhangBiao
|
136f640f60
|
【限时神装】
|
2021-01-15 17:50:43 +08:00 |
ZhangBiao
|
44a4d5485b
|
【限时神装】开坑
|
2021-01-15 17:03:51 +08:00 |
guowei
|
b42a1c8e61
|
【鸿蒙阵修改】
|
2021-01-14 21:11:53 +08:00 |
jiaoyangna
|
f0a58a5882
|
【ID1007696】
【优化】逍遥游移动时头顶出现金币的奖励特效
|
2021-01-14 15:42:21 +08:00 |
jiaoyangna
|
3a7324883e
|
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-14 15:24:51 +08:00 |
guowei
|
3f8312953e
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
|
2021-01-14 10:20:12 +08:00 |
jiaoyangna
|
5e90700036
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-13 14:30:00 +08:00 |
jiaoyangna
|
687c5fa957
|
红点提交
|
2021-01-13 14:29:56 +08:00 |
zhangqiang
|
97970275e1
|
通天教主live2d修改
|
2021-01-13 11:29:18 +08:00 |
ZhangBiao
|
716ae8cdb7
|
【观音】live2d提交
|
2021-01-13 10:28:38 +08:00 |
jiaoyangna
|
be993c9905
|
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-12 19:21:20 +08:00 |
ZhangBiao
|
1c78654a42
|
【ID1007750】【优化】青龙秘宝优化
(cherry picked from commit 02d655c394847de7f02bee6345b37988767d8f6e)
|
2021-01-12 10:14:18 +08:00 |
ZhangBiao
|
8cdbef0e70
|
【ID1007750】【优化】青龙秘宝优化
(cherry picked from commit fdcf53d59dbce0d6c7045dbdc81200a3335ccee9)
|
2021-01-12 10:14:09 +08:00 |
guowei
|
7aac4cbd32
|
【1/11鸿蒙阵bug修改】
|
2021-01-11 21:04:12 +08:00 |
zhangqiang
|
bd6ba2fa29
|
【资源导入】 通天教主 live2d and 攻击特效
|
2021-01-11 15:08:53 +08:00 |
guowei
|
372b74eb05
|
【鸿蒙阵补齐资源】
|
2021-01-11 11:03:06 +08:00 |
gaoxin
|
6c1a801779
|
Merge remote-tracking branch 'origin/gx/test_new' into master_xma_local
|
2021-01-09 13:54:01 +08:00 |
zhangqiang
|
43bd986273
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2021-01-08 19:31:36 +08:00 |
ZhangBiao
|
5bbd58c517
|
【公会援助】5点改12点文字修改
|
2021-01-08 19:30:29 +08:00 |
zhangqiang
|
d650e2f18c
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2021-01-08 19:25:31 +08:00 |
ZhangBiao
|
97141341db
|
【车迟斗法】boss位置调整2
|
2021-01-08 19:25:03 +08:00 |
zhangqiang
|
f6c9456b8c
|
【资源导入】 灵兽 金乌 live2d and 三个音效
|
2021-01-08 19:24:00 +08:00 |
zhangqiang
|
9f9b2920e3
|
【战斗回放】
|
2021-01-08 19:19:01 +08:00 |
ZhangBiao
|
657fe80519
|
【工会祭祀】提示文字 5点改0点
|
2021-01-08 19:16:48 +08:00 |
ZhangBiao
|
49a0424ba0
|
【车迟斗法】boss位置调整2
|
2021-01-08 17:22:38 +08:00 |
jiaoyangna
|
63448b9f1a
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-08 15:49:28 +08:00 |
zhangqiang
|
6f87cf04a8
|
【资源导入】 灵兽 金乌 live2d and 三个音效
|
2021-01-08 15:21:24 +08:00 |
guowei
|
f28818d4aa
|
【鸿蒙阵修改】
|
2021-01-07 21:45:22 +08:00 |
jiaoyangna
|
a5a93d43a7
|
【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-07 19:24:04 +08:00 |
jiaoyangna
|
6ae1a0b75e
|
【ID1007696】
【优化】逍遥游移动时头顶出现金币的奖励特效
|
2021-01-07 17:45:50 +08:00 |
guowei
|
6c191263bd
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Expedition.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
|
2021-01-06 20:05:35 +08:00 |
guowei
|
a5109cd144
|
【鸿蒙阵bug修改】
|
2021-01-06 19:35:41 +08:00 |
zhangqiang
|
7bedefc780
|
【战斗回放】
|
2021-01-06 16:12:54 +08:00 |
guowei
|
c428fc1fa9
|
【鸿蒙阵需求修改】
|
2021-01-06 11:48:29 +08:00 |
JieLing
|
03cdc9cf55
|
Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
|
2021-01-05 14:23:00 +08:00 |
guowei
|
30b0c26a6e
|
【鸿蒙阵】
|
2021-01-04 09:57:42 +08:00 |
jiaoyangna
|
d249a4c0c1
|
【优化】挂机宝箱显示当前的挂机时间
|
2020-12-31 15:55:20 +08:00 |
zhangqiang
|
694320d99c
|
Merge branch '0功能/1月6_版本优化' into master_develop
# Conflicts:
# Assets/Effect_ls_08_jinwu_attack_02.controller.meta
# Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
# Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
# Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
# Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
# FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
# FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png
|
2020-12-31 14:53:17 +08:00 |
JieLing
|
af7e202ea9
|
【优化】部分界面动画效果优化
|
2020-12-30 19:51:14 +08:00 |
zhangqiang
|
0a2b4f3c3e
|
【漏提】
|
2020-12-30 18:25:48 +08:00 |
zhangqiang
|
a6d16c13e5
|
【寻宝】加锁
|
2020-12-30 18:08:44 +08:00 |