gaoxin
|
adf591cbec
|
【本地化】lua代码还原
|
2021-01-27 18:16:54 +08:00 |
gaoxin
|
c567dcd426
|
【本地化】代码本地化提交
|
2021-01-26 17:08:39 +08:00 |
gaoxin
|
81b3ca1ddc
|
【本地化】 中文字还原,合并代码用
|
2021-01-26 11:13:09 +08:00 |
gaoxin
|
802881378c
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
|
2021-01-26 11:08:54 +08:00 |
gaoxin
|
3b83a72215
|
【本地化】文字还原
|
2021-01-26 11:05:27 +08:00 |
guowei
|
f86c0122bc
|
【魂印添加新手引导】
|
2021-01-20 17:26:31 +08:00 |
DESKTOP-98AVA47\Administrator
|
8f437f407d
|
【本周优化修改】
|
2021-01-15 22:11:38 +08:00 |
DESKTOP-98AVA47\Administrator
|
040971534e
|
【巅峰赛限时头像修改】
|
2021-01-15 21:06:48 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +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 |
gaoxin
|
9f691e4e05
|
【优化】scrollview分帧加载-游戏内适应性修改
|
2020-12-29 20:37:57 +08:00 |
jiaoyangna
|
1cf3f17888
|
【优化】神将解锁锁定状态基本看不出来,让其更加明显
|
2020-12-29 14:23:53 +08:00 |
jiaoyangna
|
d85bd9c3aa
|
【优化】背包分类优化
|
2020-12-28 16:25:38 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
wangzhenxing
|
96f31b63ad
|
[优化]魂宝灵宝加号点击区域扩大
|
2020-12-26 19:45:44 +09:00 |
wangzhenxing
|
e4596beb99
|
【宝物】==========宝物添加加号提示
|
2020-12-26 19:44:48 +09:00 |
zhangqiang
|
1ba79f4627
|
【装备页面】神将一键装备功能提示 已为最强装备
|
2020-12-23 16:46:41 +08:00 |
ZhangBiao
|
38a1eeee9a
|
Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:29:12 +08:00 |
gaoxin
|
a0f059ca9b
|
【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
|
2020-12-21 18:45:58 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
zhangqiang
|
328af3f66b
|
【装备套装】
|
2020-12-12 17:07:22 +08:00 |
zhangqiang
|
03e0e73665
|
【装备套装】 套装属性向下兼容
|
2020-12-11 17:31:11 +08:00 |
zhangqiang
|
3de1b43922
|
【神将升级 优化】 觉醒提示文字修改
|
2020-12-05 13:29:32 +08:00 |
zhangqiang
|
cae41baf71
|
【图鉴】 升星点亮图鉴 调整献祭坛预设
|
2020-11-17 10:57:16 +08:00 |
zhangqiang
|
2000240f64
|
【觉醒】 提示文字
|
2020-11-16 14:57:46 +08:00 |
zhangqiang
|
2f5b2c2d4f
|
【觉醒】 觉醒成功界面显示bug
|
2020-11-13 10:11:41 +08:00 |
zhangqiang
|
cbf9f5cade
|
【觉醒】问题修改
|
2020-11-12 13:55:46 +08:00 |
zhangqiang
|
0ca5e4ea13
|
【觉醒】bug
|
2020-11-11 20:21:37 +08:00 |
zhangqiang
|
adf9c87ac2
|
【灵兽提交】bug修改
|
2020-11-11 20:21:13 +08:00 |
zhangqiang
|
629eb98f1b
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-11 11:37:26 +08:00 |
zhangqiang
|
90e9e84c64
|
【觉醒】十一星的星级展示修改
|
2020-11-11 11:12:14 +08:00 |
zhangqiang
|
053de93608
|
【神将觉醒】 提交
|
2020-11-10 18:35:37 +08:00 |
zhangqiang
|
48e6d33b7b
|
【神将觉醒】 效果图 资源 提交
|
2020-11-10 17:29:38 +08:00 |
jiaoyangna
|
22d3761937
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-10 10:24:07 +08:00 |
jiaoyangna
|
3f7ae45011
|
皮肤修改
|
2020-11-10 10:23:55 +08:00 |
zhangqiang
|
6278bb0cc8
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:23 +08:00 |
zhangqiang
|
92d85c4200
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:01 +08:00 |
zhangqiang
|
6a1693939c
|
【觉醒】 觉醒添加图鉴
|
2020-11-09 20:05:51 +08:00 |
zhangqiang
|
85b21b27f0
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-09 18:04:54 +08:00 |
zhangqiang
|
c4a466637f
|
【神将升级】 太快优化
|
2020-11-09 16:29:06 +08:00 |
zhangqiang
|
f94c84f1cd
|
【觉醒】 增加觉醒页签
|
2020-11-09 15:04:48 +08:00 |
zhangqiang
|
de677bee2f
|
【觉醒】增加脚本
|
2020-11-09 11:13:53 +08:00 |
zhangqiang
|
5c73587f89
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-09 10:16:16 +08:00 |
jiaoyangna
|
f26214ac58
|
清楚红点提交
|
2020-11-07 17:23:10 +08:00 |
jiaoyangna
|
bc097708e9
|
不满足进阶条件,显示红点
|
2020-11-07 16:41:25 +08:00 |
jiaoyangna
|
e2b29242c7
|
有孙悟空皮肤,东华帝君皮肤点不到获取途径
|
2020-11-07 15:52:20 +08:00 |
jiaoyangna
|
f2f288c682
|
进阶页签属性图标显示错误
|
2020-11-07 15:44:53 +08:00 |
jiaoyangna
|
04fac7f216
|
魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗
|
2020-11-07 15:39:01 +08:00 |