ZhangBiao
|
246f19b256
|
Merge branch '0活动开发聚集地/新将活动3个' into master_develop
# Conflicts:
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/BianHuanMoCe.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/BoWenQiangShi.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
# Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_02.prefab.meta
# Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/DynamicActivityPanel_prefab_prefab.prefab.meta
# Assets/ManagedResources/EffectResUI/SheJiDaDian/Prefab/UI/DynamicActivityPanel_prefab.prefab.meta
# Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab
# Assets/ManagedResources/Prefabs/UI/TreasureStore/TreasureStorePopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto.meta
# Assets/ManagedResources/~Lua/Message/ChatProto.proto.meta
# Assets/ManagedResources/~Lua/Message/CommonProto.proto.meta
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/Expedition.proto.meta
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/gtGprotos.meta
# Assets/ManagedResources/~Lua/Message/gtGprotos/GlobalProto_pb.lua.meta
# Assets/ManagedResources/~Lua/Message/gtwprotos.meta
# Assets/ManagedResources/~Lua/Message/gtwprotos/WorldProto_pb.lua.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengXingYouLi.lua.meta
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua.meta
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/Formation/View/JumpServerHightLadderFormation.lua.meta
# Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua.meta
|
2020-12-23 15:27:52 +08:00 |
JieLing
|
652217ab37
|
【宝物合成】显示有问题
|
2020-12-15 11:51:40 +08:00 |
gaoxin
|
b9481babee
|
部分界面音效添加
|
2020-09-09 13:59:22 +08:00 |
ZhangBiao
|
70d3fcfe9f
|
断器阁动效增加
|
2020-09-04 17:03:37 +08:00 |
ZhangBiao
|
3c0c8e3f15
|
【页签优化】部分页签设定按照玩家等级开启
|
2020-09-02 18:33:17 +08:00 |
zhangqiang
|
9d757ba068
|
适配
|
2020-09-02 13:45:14 +08:00 |
jiaoyangna
|
8d6c2d3adf
|
【宝物】金币不足,一键合成没有合理提示
|
2020-08-28 14:06:08 +08:00 |
zhangqiang
|
7044422ebf
|
装备合成bug修复
|
2020-08-26 21:55:39 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
jiaoyangna
|
af58044b17
|
【宝物】宝物合成,合成预览和恭喜获得不一致
|
2020-08-24 14:31:44 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
zhangqiang
|
0a8bdc5765
|
援助 十绝阵 合成 提示性bug
|
2020-08-04 14:02:28 +08:00 |
gaoxin
|
b0002cf781
|
语言文字替换
|
2020-07-25 20:42:11 +08:00 |
jiaoyangna
|
064b819f4a
|
修改星星提交
|
2020-07-24 20:03:06 +08:00 |
jiaoyangna
|
ba8b5a3c93
|
【宝物合成】一键合成预览处显示错误
|
2020-07-22 15:50:18 +08:00 |
jiaoyangna
|
c15b84b096
|
Merge branch 'master_develop' into equip
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
|
2020-07-07 18:13:34 +08:00 |
jiaoyangna
|
0f611408b8
|
合成装备刷新界面
|
2020-07-07 17:51:02 +08:00 |
jiaoyangna
|
7f54e3c88a
|
装备提交
|
2020-07-06 20:35:39 +08:00 |
JieLing
|
461c64b04a
|
svn逻辑同步
|
2020-07-02 14:53:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |
JieLing
|
cf5f3e9952
|
内网测试 0.15.12
|
2020-06-13 11:47:13 +08:00 |
JieLing
|
59db757cf9
|
六月三号开发提交
|
2020-06-03 19:09:01 +08:00 |
JieLing
|
063868ce73
|
外网包 0.16.1
|
2020-05-25 19:16:23 +08:00 |
JieLing
|
266b9065d8
|
测试版本 带热更 0.15.1
|
2020-05-15 16:52:35 +08:00 |
JieLing
|
4c8d2cf8de
|
提交
|
2020-05-09 13:31:21 +08:00 |