Commit Graph

90 Commits (a5f744261ba1fc959a62459cf9b1a91c4af7d1c3)

Author SHA1 Message Date
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
jiaoyangna 0a772f466b 皮肤提交 2020-11-06 20:36:38 +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
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
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
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
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
jiaoyangna e2fae0cc52 皮肤提交 2020-11-06 09:37:27 +08:00
ZhangBiao 6f75850ae4 【易经宝库】提交 2020-11-05 19:10:20 +08:00
zhangqiang a85abaa2a0 【大闹天宫】 节点boss 站位错误 修复 2020-11-05 15:56:24 +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
yuanshuai 08a1d3a98d 【逍遥游】首通奖励协议提交 2020-10-28 11:31:00 +08:00
zhangqiang e1d14466db 协议提交 2020-10-27 14:10:24 +08:00
gaoxin 343237ae6d 【灵兽】战斗数据协议添加,修复战斗数据组建错误 2020-10-26 14:56:03 +08:00
ZhangBiao 7b4f959687 Merge branch '0活动开发聚集地/社稷大典' into master_develop
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2020-10-24 16:47:45 +08:00
ZhangBiao d57fc60aa1 社稷大典,差个加工会限制和领奖界面 2020-10-23 19:34:03 +08:00
jiaoyangna 911c4b9f54 xieyi commit 2020-11-05 04:11:09 +08:00
zhangqiang 2cf881c4d5 灵兽提交 2020-10-23 15:12:21 +08:00
zhangqiang 6767828cdc Merge branch 'master_develop' into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/Spine/ls_06_baize.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.atlas.txt.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.png.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize.skel.bytes.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Atlas.asset.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_Material.mat.meta
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset
#	Assets/ManagedResources/Spine/ls_06_baize/ls_06_baize_SkeletonData.asset.meta
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2020-10-23 14:38:50 +08:00
jiaoyangna d49c1b97cb 灵兽羁绊提交 2020-11-04 22:25:59 +08:00
zhangqiang 0270d54e10 灵兽提交 2020-10-22 12:41:44 +08:00
zhangqiang 83088ea429 提交 2020-10-22 10:03:46 +08:00
zhangqiang 3a6c14f607 灵兽提交 2020-10-20 20:18:02 +08:00
yuanshuai 4316c30bf2 逍遥游红点和帮助弹窗提交 2020-10-19 20:29:49 +08:00
zhangqiang 086292c67e 提交 2020-10-19 18:28:29 +08:00
yuanshuai 2924f06560 协议提交 2020-10-16 10:25:57 +08:00
jiaoyangna 598ca9e91f 修改提交 2020-10-15 19:41:47 +08:00
jiaoyangna 7a86931564 转盘,招募提交 2020-10-15 16:50:56 +08:00
jiaoyangna e12a075e2c bosstij 2020-10-15 14:16:57 +08:00
jiaoyangna b3fac6731e boss ,转盘协议修改提交 2020-10-11 09:45:18 +08:00
yuanshuai 4fb85f49e1 协议提交 2020-10-14 15:09:43 +08:00
yuanshuai 5925ca9e14 协议提交 2020-10-13 16:19:33 +08:00
jiaoyangna 34cc05a87d 青龙秘宝周任务修改, 2020-10-02 22:09:01 +08:00
zhangqiang b3898fe07a 音效修改 加 公会副本接不可扫荡推送 2020-09-14 13:54:45 +08:00
ZhangBiao c67d731374 天宫秘宝增加购买校验 2020-09-08 10:32:49 +08:00
zhangqiang fa3003fdc6 云梦祈福修改提交 2020-08-27 19:28:06 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
zhangqiang d51276f132 公会副本提交 2020-08-26 15:10:33 +08:00
ZhangBiao a2a870f421 【社稷大典】提交4 2020-10-24 18:41:21 +08:00
yuanshuai 131d1aab1b 【逍遥游】红点和帮助弹窗提交 2020-10-19 21:39:48 +08:00