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 |
ZhangBiao
|
e40364082c
|
Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:21:27 +08:00 |
ZhangBiao
|
30f8049ef5
|
Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-12-23 11:13:48 +08:00 |
ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
JieLing
|
fa24af770b
|
【协议】战斗协议添加id字段
|
2020-12-18 19:38:18 +08:00 |
gaoxin
|
79f6090afb
|
【协议】回滚系统消息item字段类型
|
2020-12-18 18:22:52 +08:00 |
gaoxin
|
ef1ced3ef7
|
【战报系统】基础功能添加
|
2020-12-18 16:51:13 +08:00 |
gaoxin
|
abc76576b6
|
【战报系统】代码添加
|
2020-12-17 18:36:08 +08:00 |
zhangqiang
|
6ca1f1980b
|
提交协议
|
2020-12-16 20:37:36 +08:00 |
zhangqiang
|
74aef8e711
|
Merge branch '0功能/跨服十绝阵' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-16 20:27:53 +08:00 |
zhangqiang
|
944cff4976
|
【跨服天梯】主界面修改提交
|
2020-12-16 20:25:19 +08:00 |
zhangqiang
|
fd28024dc2
|
【跨服天梯】提交
|
2020-12-16 11:28:57 +08:00 |
ZhangBiao
|
4c73219b39
|
【森罗幻境】诸多bug 修复
|
2020-12-12 18:00:18 +08:00 |
jiaoyangna
|
175752ea75
|
[跨服十绝阵] 提交
|
2020-12-11 15:28:44 +08:00 |
zhangqiang
|
d20ed07826
|
【跨服天梯】 提交
|
2020-12-11 11:59:33 +08:00 |
zhangqiang
|
bf1f26662a
|
【跨服天梯】
|
2020-12-05 13:13:19 +08:00 |
zhangqiang
|
ac367a1a0c
|
【跨服天梯】 协议提交
|
2020-12-05 10:38:17 +08:00 |
ZhangBiao
|
86d190572a
|
【神将来袭】加战斗了
|
2020-12-02 17:14:52 +08:00 |
gaoxin
|
d0cb62fab6
|
【背包】物品最大数量限制提示添加
|
2020-11-27 13:31:24 +08:00 |
zhangqiang
|
80c949c54d
|
【灵兽】 灵兽数据分页
|
2020-11-27 10:57:50 +08:00 |
zhangqiang
|
098c66e5b8
|
【跨服天梯】资源预设提交
|
2020-11-19 18:30:19 +08:00 |
ZhangBiao
|
8a5d51e2a3
|
【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27)
|
2020-11-13 12:12:44 +08:00 |
ZhangBiao
|
de32379f8e
|
【竞技场】竞技场增加输赢奖励
|
2020-11-07 18:52:04 +08:00 |
jiaoyangna
|
0a772f466b
|
皮肤提交
|
2020-11-06 20:36:38 +08:00 |
jiaoyangna
|
a6904526d3
|
协议提交
|
2020-11-06 17:26:58 +08:00 |
jiaoyangna
|
41f62176f2
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-06 17:19:34 +08:00 |
jiaoyangna
|
fe9b73aa0b
|
协议提交
|
2020-11-06 17:19:24 +08:00 |
zhangqiang
|
aa2db3e25e
|
【大闹天宫】 节点boss 站位错误 修复
|
2020-11-06 16:51:44 +08:00 |
ZhangBiao
|
5e130a7585
|
Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 16:17:12 +08:00 |
wangzhenxing
|
1123b38709
|
协议提交
|
2020-11-06 13:31:45 +08:00 |
jiaoyangna
|
e2fae0cc52
|
皮肤提交
|
2020-11-06 09:37:27 +08:00 |
ZhangBiao
|
6f75850ae4
|
【易经宝库】提交
|
2020-11-05 19:10:20 +08:00 |
jiaoyangna
|
b18b4cfd58
|
【皮肤】协议提交
|
2020-11-04 13:52:10 +08:00 |
jiaoyangna
|
509357e333
|
Merge branch 'master_xma_local' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-04 10:54:54 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
ZhangBiao
|
f79499faea
|
【易经宝库】开始获取活动数据
|
2020-11-03 09:58:37 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
yuanshuai
|
ec3defb2c4
|
【逍遥游】首通奖励协议提交
|
2020-10-30 11:03:39 +08:00 |
ZhangBiao
|
620862f64f
|
Merge branch '0活动开发聚集地/新将来袭' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_bgj_00091/Prefab/Effect_c_bgj_00091_attack_01.prefab.meta
# Assets/ManagedResources/Prefabs/Live2d/live2d_c_bgj_00091.prefab
# Assets/ManagedResources/Prefabs/Live2d/live2d_c_mjn_00063.prefab.meta
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab.meta
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayManager.lua
|
2020-12-07 10:33:26 +08:00 |
gaoxin
|
f98156b5cc
|
Merge remote-tracking branch 'origin/0功能/背包最大值限制提示添加' into master_develop
|
2020-11-27 13:41:44 +08:00 |
zhangqiang
|
79fb88aa93
|
Merge branch 'master_xma_local' into master_develop
|
2020-11-27 11:03:33 +08:00 |
ZhangBiao
|
101c23c794
|
Merge branch '0功能/竞技场胜负奖励' into master_develop
|
2020-11-26 14:29:54 +08:00 |
ZhangBiao
|
c2933ddb96
|
Merge branch '0活动开发聚集地/灵兽抽卡(可更换兽)' into master_develop
# Conflicts:
# Assets/ManagedResources/BG/lingshou_lingshoubeijing_03.jpg.meta
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua
|
2020-11-13 14:20:49 +08:00 |
ZhangBiao
|
8185be7c27
|
【灵兽抽卡】增加可选灵兽
|
2020-11-13 12:12:06 +08:00 |
jiaoyangna
|
351785e3fc
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2020-11-06 21:11:18 +08:00 |
gaoxin
|
53b6f4483f
|
Merge branch 'master_xma_local' into master_develop
# Conflicts:
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_yl_vo_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_zl_vo_01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh03.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_hd01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_ql01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl01.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl02.mp3.meta
# Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl03.mp3.meta
# Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta
# Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta
# Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta
# Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2020-11-06 19:56:52 +08:00 |
ZhangBiao
|
73c94dee90
|
Merge branch '0活动开发聚集地/易经宝库' into master_develop
# Conflicts:
# Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials.meta
# Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
# Assets/ManagedResources/Effects/Model/Materials.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-11-06 17:34:27 +08:00 |
wangzhenxing
|
3d7d32ac12
|
协议提交
|
2020-11-06 12:04:04 +08:00 |
jiaoyangna
|
be7be732d3
|
Merge branch 'master_develop' into 0功能/皮肤
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
|
2020-11-06 10:54:04 +08:00 |
zhangqiang
|
a85abaa2a0
|
【大闹天宫】 节点boss 站位错误 修复
|
2020-11-05 15:56:24 +08:00 |