Commit Graph

3022 Commits (e60d24f9a3a9715a3a06ed2389d20118c0d5944f)
 

Author SHA1 Message Date
zhangqiang 3d72b9c0ea 灵兽提交 添加羁绊红点预设 2020-10-24 16:11:58 +08:00
zhangqiang 194187e5e5 灵兽提交 2020-10-24 15:55:41 +08:00
zhangqiang 3407f7d57e Merge branch '0功能/灵兽系统' into master_develop
# Conflicts:
#	Assets/ManagedResources/Icons/ls_01_qingluan_t1.png.meta
#	Assets/ManagedResources/Icons/ls_02_huodou_t1.png.meta
#	Assets/ManagedResources/Icons/ls_03_yinglong_t1.png.meta
#	Assets/ManagedResources/Icons/ls_04_zhulong_t1.png.meta
#	Assets/ManagedResources/Icons/ls_05_fenghuang_t1.png.meta
#	Assets/ManagedResources/Icons/ls_06_baize_t1.png.meta
#	Assets/ManagedResources/Icons/ls_07_jukun_t1.png.meta
2020-10-24 15:41:12 +08:00
jiaoyangna c2f2c8234b 神将修改 2020-10-29 13:17:56 +08:00
wangzhenxing a853094356 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-24 15:33:00 +09:00
zhangqiang 19f13e3cf6 灵兽连续升级修改 2020-10-24 15:25:24 +08:00
wangzhenxing e30de8da3f 灵兽提交 2020-10-24 15:32:39 +09:00
zhangqiang 0f4cd6d43e Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-24 14:15:45 +08:00
zhangqiang 7a4cd7ba8f 零售品升级升星红点 2020-10-24 14:15:35 +08:00
ZhangBiao ce11afc1e8 添加公会检查 和排行细节修改,初始的进度条积分有问题 2020-10-24 13:18:04 +08:00
gaoxin ad2b935e26 Merge branch 'master_develop' into 0功能/灵兽战斗
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_01.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleManager.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleManager.lua.meta
2020-10-23 20:58:07 +08:00
gaoxin b9cf78c850 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_01_qingluan/Prefab/Effect_ls_01_qingluan_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Prefab/Effect_ls_04_zhulong_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Prefab/Effect_ls_04_zhulong_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_04_zhulong/Prefab/Effect_ls_04_zhulong_attack_03.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_fenghuang/Prefab/Effect_ls_05_fenghuang_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_fenghuang/Prefab/Effect_ls_05_fenghuang_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_fenghuang/Prefab/Effect_ls_05_fenghuang_attack_03.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_huodou/Prefab/Effect_ls_05_huodou_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_05_huodou/Prefab/Effect_ls_05_huodou_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Prefab/ls_06_baize_attack_01.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Prefab/ls_06_baize_attack_02.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_ls_06_baize/Prefab/ls_06_baize_attack_03.prefab
2020-10-23 20:47:58 +08:00
gaoxin 17261cdcda 【灵兽】灵兽技能特效资源添加 2020-10-23 20:47:17 +08:00
gaoxin cadc2d77b2 【战斗0.0.8】灵兽战斗结构搭建 2020-10-23 20:44:43 +08:00
jiaoyangna a595c770a1 累计充值修改 2020-11-04 00:57:23 +08:00
jiaoyangna 12967078f0 限时召唤修改提交 2020-11-04 00:15:26 +08:00
jiaoyangna 73dce1a7c3 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 20:02:33 +08:00
jiaoyangna 2e962b3cef 抽卡界面修改提交 2020-10-23 20:02:20 +08:00
jiaoyangna a21d28fb83 再来十次修改提交 2020-10-23 19:38:27 +08:00
ZhangBiao d57fc60aa1 社稷大典,差个加工会限制和领奖界面 2020-10-23 19:34:03 +08:00
jiaoyangna e6aad73af4 louti 2020-10-23 19:31:39 +08:00
jiaoyangna 1ef09a42f5 再来一次界面修改提交 2020-10-23 19:30:32 +08:00
jiaoyangna 7bfec03778 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 19:14:31 +08:00
jiaoyangna f882c9c70c 抽卡提交 2020-10-23 19:14:24 +08:00
jiaoyangna 2f83fdfd95 灵兽抽卡回滚提交 2020-11-05 05:54:10 +08:00
jiaoyangna 911c4b9f54 xieyi commit 2020-11-05 04:11:09 +08:00
zhangqiang 291cddbb3f 灵兽提交 2020-10-23 19:10:00 +08:00
wangzhenxing 7072f53fab 合并冲突提交 2020-10-23 19:53:45 +09:00
wangzhenxing bfaed0d937 灵兽放生提交 2020-10-23 19:45:14 +09:00
gaoxin 2965398d62 【灵兽】灵兽技能特效资源添加 2020-10-23 18:04:24 +08:00
zhangqiang e7c981763a language 修改 2020-10-23 15:58:38 +08:00
zhangqiang 2cf881c4d5 灵兽提交 2020-10-23 15:12:21 +08:00
jiaoyangna 92cdfa96aa tupian meta commit 2020-11-05 03:07:34 +08:00
jiaoyangna eee353cc4e generalpopup commit 2020-11-05 03:06:53 +08:00
jiaoyangna c1b227c26b Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-11-05 03:03:16 +08:00
jiaoyangna da88485b4c lingshou zhaohuan tijiao 2020-11-05 03:03:08 +08:00
jiaoyangna a39bc32ef6 灵兽羁绊提交 2020-11-04 23:00:32 +08:00
jiaoyangna e9f42ce609 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua
2020-11-04 22:27:36 +08:00
jiaoyangna d49c1b97cb 灵兽羁绊提交 2020-11-04 22:25:59 +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
wangzhenxing 91ee82c5e1 涅槃提交 2020-10-23 14:05:50 +09:00
wangzhenxing 1466227510 Merge branch '0功能/灵兽系统' of http://60.1.1.230/gaoxin/JL_Client into 0功能/灵兽系统 2020-10-23 09:55:02 +09:00
wangzhenxing 22a2789d08 灵兽涅槃提交 2020-10-23 09:54:49 +09:00
zhangqiang 7452d795e8 灵兽提交 2020-10-22 20:50:11 +08:00
liujiaqi 95072a98c5 灵兽商店社稷大典商店标题资源灵兽小头像 2020-10-22 19:00:10 +08:00
jiaoyangna dbccde8b77 累计充值修改提交 2020-11-04 05:30:12 +08:00
jiaoyangna b6e5225bcf 累计充值修改提交 2020-11-04 05:23:46 +08:00
jiaoyangna aac7afa586 主题活动修改 2020-11-04 04:34:51 +08:00
jiaoyangna 205340e73a 累计充值修改 2020-11-04 04:05:20 +08:00
jiaoyangna fca650d5b3 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-11-04 03:51:10 +08:00