Commit Graph

132 Commits (b099f0e2513164837da97ccde527369f2d2fab6e)

Author SHA1 Message Date
gaoxin b099f0e251 数据打点静态数据添加 2020-07-17 17:50:05 +08:00
gaoxin 76d00dce34 支付接口调试 2020-07-17 11:39:24 +08:00
gaoxin 1fbb30c1a8 登录服地址修改 2020-07-16 19:51:56 +08:00
gaoxin 7a7446f145 sdk可以正常登录了 2020-07-16 19:51:38 +08:00
gaoxin 5b7b28f1f9 sdk接入结构修改 2020-07-16 17:00:24 +08:00
gaoxin 8974820606 生成warp文件,修复本地运行时的错误 2020-07-15 19:15:00 +08:00
gaoxin 037290c657 sdk工程加入猕猴桃sdk 2020-07-15 17:53:40 +08:00
gaoxin 7605156317 sdk结构修改 2020-07-15 13:44:37 +08:00
JieLing d10581150a sdk修改配置 2020-07-13 16:47:39 +08:00
gaoxin bd83a45de2 Merge branch 'master_test' into 接入SDK
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Audio/Skill/actor_voc.meta
#	Assets/ManagedResources/PublicArtRes/Models/Materials.meta
#	Assets/ManagedResources/~Lua/Config/Data.meta
2020-07-13 12:55:15 +08:00
gaoxin 3f54c121b1 sdk=接口完善 2020-07-13 12:25:55 +08:00
JieLing 325d9c7224 内网测试 0.15.28 2020-07-11 17:33:26 +08:00
gaoxin 8be0056346 技能名称音效添加 2020-07-11 16:26:33 +08:00
gaoxin 679752e628 技能音效添加 2020-07-11 16:26:27 +08:00
gaoxin fdb4c66ed5 访客id接口修改 2020-07-11 15:05:23 +08:00
JieLing 9b97aef3d7 内网 0.15.15 2020-07-10 18:20:58 +08:00
gaoxin 465ca19e84 sdk相关文档提交 2020-07-10 09:59:56 +08:00
2han9B1a0 ce1d7014f3 2020-07-09 19:59:23 +08:00
2han9B1a0 12b0fa9f73 特权修改,宝囊商店 2020-07-09 18:20:53 +08:00
2han9B1a0 f158fa6536 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 16:14:56 +08:00
2han9B1a0 10a2181305 小游戏18bugxiugai 2020-07-09 16:14:44 +08:00
gaoxin 6303805bfa 修复未命中时报错的问题 2020-07-09 15:18:02 +08:00
jiaoyangna c3e1aaff6e 【限时召唤】奖池预览,去掉一二星神将
【心魔试炼】奖励预览,数量多的时候,需要调整
2020-07-09 13:35:59 +08:00
2han9B1a0 8e853b2758 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-09 11:53:10 +08:00
2han9B1a0 47b34f9d6e 宝囊 2020-07-09 11:52:40 +08:00
jiaoyangna f9c49d00e3 宝物bug修改 2020-07-09 10:53:15 +08:00
jiaoyangna 37c7c839c4 限时召唤提交 2020-07-09 10:04:20 +08:00
gaoxin 3e43ea4876 Merge branch '优化cardrenderer' into master_develop 2020-07-08 21:23:04 +08:00
gaoxin b5ab2384c3 优化rendertexture的数量20->6 2020-07-08 21:21:49 +08:00
2han9B1a0 12d9208f90 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 21:19:49 +08:00
2han9B1a0 7c7684a714 冲突提交 2020-07-08 21:19:34 +08:00
2han9B1a0 39d035b21a no message 2020-07-08 21:09:45 +08:00
gaoxin ce13a0263e Merge branch '战斗优化v_n.0' into master_develop
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/QianKunBox.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
#	Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
#	Assets/StreamingAssets/Android.meta
2020-07-08 19:55:09 +08:00
jiaoyangna 21778b4a74 限时提交 2020-07-08 19:16:04 +08:00
gaoxin da6bb67d50 技能配置优化 2020-07-08 18:23:12 +08:00
2han9B1a0 5e00986d05 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 17:03:44 +08:00
2han9B1a0 7e1e15f8af 报错修改 2020-07-08 17:03:34 +08:00
jiaoyangna d247e40129 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 16:50:10 +08:00
jiaoyangna 4e49e4582a 天宫商店数量显示调整,去除log 2020-07-08 16:49:59 +08:00
2han9B1a0 d5bc2b4ef1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-08 16:24:27 +08:00
jiaoyangna 9b138fe566 限时召唤提交 2020-07-08 16:23:04 +08:00
2han9B1a0 1b89e68c95 包囊 2020-07-08 16:23:02 +08:00
jiaoyangna 070fb43964 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua
2020-07-08 16:20:26 +08:00
jiaoyangna 1df7a8006a 【ID1008244】
【限时招募】阶段奖励进度条显示不准
2020-07-08 16:19:46 +08:00
2han9B1a0 51089bd2c8 福利界面报错 2020-07-08 11:46:43 +08:00
gaoxin b999786cbb 部分技能配置 2020-07-08 10:34:41 +08:00
2han9B1a0 272cfdc71a 乾坤包囊 2020-07-08 09:41:56 +08:00
2han9B1a0 4aed395ed3 乾坤包囊 2020-07-08 09:40:36 +08:00
jiaoyangna 67b4631368 高级探宝提交 2020-07-07 20:13:36 +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